Commit f5e4edb8 authored by NeilBrown's avatar NeilBrown Committed by Felipe Balbi

power: twl4030_charger: find associated phy by more reliable means.

twl4030_charger currently finds the associated phy
using usb_get_phy() which will return the first USB2 phy.
If your platform has multiple such phys (as mine does),
this is not reliable (and reliably fails on the GTA04).

Change to use devm_usb_get_phy_by_node(), having found the
node by looking for an appropriately named sibling in
device-tree.

This makes usb-charging dependent on correct device-tree
configuration.
Acked-By: default avatarSebastian Reichel <sre@kernel.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent e842b84c
TWL BCI (Battery Charger Interface) TWL BCI (Battery Charger Interface)
The battery charger needs to interact with the USB phy in order
to know when charging is permissible, and when there is a connection
or disconnection.
The choice of phy cannot be configured at a hardware level, so there
is no value in explicit configuration in device-tree. Rather
if there is a sibling of the BCI node which is compatible with
"ti,twl4030-usb", then that is used to determine when and how
use USB power for charging.
Required properties: Required properties:
- compatible: - compatible:
- "ti,twl4030-bci" - "ti,twl4030-bci"
......
...@@ -30,6 +30,9 @@ TWL4030 USB PHY AND COMPARATOR ...@@ -30,6 +30,9 @@ TWL4030 USB PHY AND COMPARATOR
- usb_mode : The mode used by the phy to connect to the controller. "1" - usb_mode : The mode used by the phy to connect to the controller. "1"
specifies "ULPI" mode and "2" specifies "CEA2011_3PIN" mode. specifies "ULPI" mode and "2" specifies "CEA2011_3PIN" mode.
If a sibling node is compatible "ti,twl4030-bci", then it will find
this device and query it for USB power status.
twl4030-usb { twl4030-usb {
compatible = "ti,twl4030-usb"; compatible = "ti,twl4030-usb";
interrupts = < 10 4 >; interrupts = < 10 4 >;
......
...@@ -638,10 +638,15 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) ...@@ -638,10 +638,15 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
INIT_WORK(&bci->work, twl4030_bci_usb_work); INIT_WORK(&bci->work, twl4030_bci_usb_work);
bci->transceiver = usb_get_phy(USB_PHY_TYPE_USB2); bci->usb_nb.notifier_call = twl4030_bci_usb_ncb;
if (!IS_ERR_OR_NULL(bci->transceiver)) { if (bci->dev->of_node) {
bci->usb_nb.notifier_call = twl4030_bci_usb_ncb; struct device_node *phynode;
usb_register_notifier(bci->transceiver, &bci->usb_nb);
phynode = of_find_compatible_node(bci->dev->of_node->parent,
NULL, "ti,twl4030-usb");
if (phynode)
bci->transceiver = devm_usb_get_phy_by_node(
bci->dev, phynode, &bci->usb_nb);
} }
/* Enable interrupts now. */ /* Enable interrupts now. */
...@@ -671,10 +676,6 @@ static int __init twl4030_bci_probe(struct platform_device *pdev) ...@@ -671,10 +676,6 @@ static int __init twl4030_bci_probe(struct platform_device *pdev)
return 0; return 0;
fail_unmask_interrupts: fail_unmask_interrupts:
if (!IS_ERR_OR_NULL(bci->transceiver)) {
usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
usb_put_phy(bci->transceiver);
}
free_irq(bci->irq_bci, bci); free_irq(bci->irq_bci, bci);
fail_bci_irq: fail_bci_irq:
free_irq(bci->irq_chg, bci); free_irq(bci->irq_chg, bci);
...@@ -703,10 +704,6 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev) ...@@ -703,10 +704,6 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff, twl_i2c_write_u8(TWL4030_MODULE_INTERRUPTS, 0xff,
TWL4030_INTERRUPTS_BCIIMR2A); TWL4030_INTERRUPTS_BCIIMR2A);
if (!IS_ERR_OR_NULL(bci->transceiver)) {
usb_unregister_notifier(bci->transceiver, &bci->usb_nb);
usb_put_phy(bci->transceiver);
}
free_irq(bci->irq_bci, bci); free_irq(bci->irq_bci, bci);
free_irq(bci->irq_chg, bci); free_irq(bci->irq_chg, bci);
power_supply_unregister(bci->usb); power_supply_unregister(bci->usb);
......
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