Commit 7bb5a650 authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Sebastian Reichel

power: supply: twl4030-charger: add deferred probing for phy and iio

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: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parent 3950c95e
...@@ -985,8 +985,12 @@ static int twl4030_bci_probe(struct platform_device *pdev) ...@@ -985,8 +985,12 @@ static int twl4030_bci_probe(struct platform_device *pdev)
bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac"); bci->channel_vac = devm_iio_channel_get(&pdev->dev, "vac");
if (IS_ERR(bci->channel_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; bci->channel_vac = NULL;
dev_warn(&pdev->dev, "could not request vac iio channel");
} }
if (bci->dev->of_node) { if (bci->dev->of_node) {
...@@ -998,6 +1002,14 @@ static int twl4030_bci_probe(struct platform_device *pdev) ...@@ -998,6 +1002,14 @@ static int twl4030_bci_probe(struct platform_device *pdev)
bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
bci->transceiver = devm_usb_get_phy_by_node( bci->transceiver = devm_usb_get_phy_by_node(
bci->dev, phynode, &bci->usb_nb); 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;
}
} }
} }
......
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