power: bq24735-charger: fix failed i2c with ac-detect

When an ac-detect pin exists, but the charger is not plugged in,
the chip will not respond to i2c messages, causing the module to
fail when inserted.

Signed-off-by: Jonathan Tinkham <sctincman@gmail.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

diff --git a/drivers/power/bq24735-charger.c b/drivers/power/bq24735-charger.c
index 079d1c6c2a8f0e35d3fd1683e4034eee84b7662f..022a09ceab73b7b319fa05dec590ca770d60f594 100644 (file)
--- a/drivers/power/bq24735-charger.c
+++ b/drivers/power/bq24735-charger.c
@@ -381,27 +381,6 @@ static int bq24735_charger_probe(struct i2c_client *client,
 
        i2c_set_clientdata(client, charger);
 
-       ret = bq24735_read_word(client, BQ24735_MANUFACTURER_ID);
-       if (ret < 0) {
-               dev_err(&client->dev, "Failed to read manufacturer id : %d\n",
-                       ret);
-               return ret;
-       } else if (ret != 0x0040) {
-               dev_err(&client->dev,
-                       "manufacturer id mismatch. 0x0040 != 0x%04x\n", ret);
-               return -ENODEV;
-       }
-
-       ret = bq24735_read_word(client, BQ24735_DEVICE_ID);
-       if (ret < 0) {
-               dev_err(&client->dev, "Failed to read device id : %d\n", ret);
-               return ret;
-       } else if (ret != 0x000B) {
-               dev_err(&client->dev,
-                       "device id mismatch. 0x000b != 0x%04x\n", ret);
-               return -ENODEV;
-       }
-
        if (gpio_is_valid(charger->pdata->status_gpio)) {
                ret = devm_gpio_request(&client->dev,
                                        charger->pdata->status_gpio,
@@ -415,6 +394,30 @@ static int bq24735_charger_probe(struct i2c_client *client,
                charger->pdata->status_gpio_valid = !ret;
        }
 
+       if (!charger->pdata->status_gpio_valid
+           || bq24735_charger_is_present(charger)) {
+               ret = bq24735_read_word(client, BQ24735_MANUFACTURER_ID);
+               if (ret < 0) {
+                       dev_err(&client->dev, "Failed to read manufacturer id : %d\n",
+                               ret);
+                       return ret;
+               } else if (ret != 0x0040) {
+                       dev_err(&client->dev,
+                               "manufacturer id mismatch. 0x0040 != 0x%04x\n", ret);
+                       return -ENODEV;
+               }
+
+               ret = bq24735_read_word(client, BQ24735_DEVICE_ID);
+               if (ret < 0) {
+                       dev_err(&client->dev, "Failed to read device id : %d\n", ret);
+                       return ret;
+               } else if (ret != 0x000B) {
+                       dev_err(&client->dev,
+                               "device id mismatch. 0x000b != 0x%04x\n", ret);
+                       return -ENODEV;
+               }
+       }
+
        ret = bq24735_config_charger(charger);
        if (ret < 0) {
                dev_err(&client->dev, "failed in configuring charger");