From ce1da8244607232da9f9785d252d8870baef9a80 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Sun, 14 Jul 2013 21:52:38 +0800 Subject: [PATCH] ENGR00269945: gpio: pca953x: add device_reset() call The pca953x type of devices, e.g. max7310, may have a reset which needs to be handled to get the device start working. Add a device_reset() call for that, and defer the probe if the reset controller for that is not ready yet. [shawn.guo: cherry-pick commit e95dae89011e from imx_3.10.y] Signed-off-by: Shawn Guo Conflicts: drivers/gpio/gpio-pca953x.c --- drivers/gpio/gpio-pca953x.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index 019b23b955a2..3ba6157bd04b 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #ifdef CONFIG_OF_GPIO #include @@ -741,6 +742,10 @@ static int pca953x_probe(struct i2c_client *client, mutex_init(&chip->i2c_lock); + ret = device_reset(&client->dev); + if (ret == -ENODEV) + return -EPROBE_DEFER; + /* initialize cached registers from their original values. * we can't share this chip with another i2c master. */ -- 2.39.5