mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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>
This commit is contained in:
parent
4f4bfe6bf1
commit
1a3adce1c2
1 changed files with 24 additions and 21 deletions
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue