Skip to content

Commit

Permalink
power: supply: twl4030-charger: add deferred probing for phy and iio
Browse files Browse the repository at this point in the history
This fixes an issue if both this twl4030_charger driver and
phy-twl4030-usb are compiled as modules and loaded in random order.

It has been observed on GTA04 and OpenPandora devices that in worst
case the boot process hangs and in best case the AC detection fails
with a warning.

Therefore we add deferred probing checks for the usb_phy and the
iio channel for AC detection.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
  • Loading branch information
goldelico authored and sre committed Jul 3, 2017
1 parent 3950c95 commit 7bb5a65
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion drivers/power/supply/twl4030_charger.c
Original file line number Diff line number Diff line change
Expand Up @@ -985,8 +985,12 @@ static int twl4030_bci_probe(struct platform_device *pdev)

bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac");
if (IS_ERR(bci->channel_vac)) {
ret = PTR_ERR(bci->channel_vac);
if (ret == -EPROBE_DEFER)
return ret; /* iio not ready */
dev_warn(&pdev->dev, "could not request vac iio channel (%d)",
ret);
bci->channel_vac = NULL;
dev_warn(&pdev->dev, "could not request vac iio channel");
}

if (bci->dev->of_node) {
Expand All @@ -998,6 +1002,14 @@ static int twl4030_bci_probe(struct platform_device *pdev)
bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
bci->transceiver = devm_usb_get_phy_by_node(
bci->dev, phynode, &bci->usb_nb);
if (IS_ERR(bci->transceiver)) {
ret = PTR_ERR(bci->transceiver);
if (ret == -EPROBE_DEFER)
return ret; /* phy not ready */
dev_warn(&pdev->dev, "could not request transceiver (%d)",
ret);
bci->transceiver = NULL;
}
}
}

Expand Down

0 comments on commit 7bb5a65

Please sign in to comment.