Commit 0f6dad11 authored by Linus Walleij's avatar Linus Walleij Committed by Sebastian Reichel

power: supply: ab8500_charger: Restrict ADC retrieveal

The AB8505 only has two ADC channels: the voltage and current
provided from VBUS (USB). It does not support AC charging at all.
Make sure we don't try to retrieve the non-existing channels.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 75ee3f6f
...@@ -3443,17 +3443,19 @@ static int ab8500_charger_probe(struct platform_device *pdev) ...@@ -3443,17 +3443,19 @@ static int ab8500_charger_probe(struct platform_device *pdev)
di->parent = dev_get_drvdata(pdev->dev.parent); di->parent = dev_get_drvdata(pdev->dev.parent);
/* Get ADC channels */ /* Get ADC channels */
di->adc_main_charger_v = devm_iio_channel_get(dev, "main_charger_v"); if (!is_ab8505(di->parent)) {
if (IS_ERR(di->adc_main_charger_v)) { di->adc_main_charger_v = devm_iio_channel_get(dev, "main_charger_v");
ret = dev_err_probe(dev, PTR_ERR(di->adc_main_charger_v), if (IS_ERR(di->adc_main_charger_v)) {
"failed to get ADC main charger voltage\n"); ret = dev_err_probe(dev, PTR_ERR(di->adc_main_charger_v),
return ret; "failed to get ADC main charger voltage\n");
} return ret;
di->adc_main_charger_c = devm_iio_channel_get(dev, "main_charger_c"); }
if (IS_ERR(di->adc_main_charger_c)) { di->adc_main_charger_c = devm_iio_channel_get(dev, "main_charger_c");
ret = dev_err_probe(dev, PTR_ERR(di->adc_main_charger_c), if (IS_ERR(di->adc_main_charger_c)) {
"failed to get ADC main charger current\n"); ret = dev_err_probe(dev, PTR_ERR(di->adc_main_charger_c),
return ret; "failed to get ADC main charger current\n");
return ret;
}
} }
di->adc_vbus_v = devm_iio_channel_get(dev, "vbus_v"); di->adc_vbus_v = devm_iio_channel_get(dev, "vbus_v");
if (IS_ERR(di->adc_vbus_v)) { if (IS_ERR(di->adc_vbus_v)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment