diff options
| author | Heikki Krogerus | 2010-11-08 11:22:40 +0100 |
|---|---|---|
| committer | Anton Vorontsov | 2010-11-18 14:56:21 +0100 |
| commit | e1a85694e08d03efae9e08fdb292dfd4870837bc (patch) | |
| tree | 5909033ce66fa7f3ce108cb87e16fb1eadbf1da3 /drivers/power | |
| parent | isp1704_charger: Set isp->dev before anything needs it (diff) | |
| download | kernel-qcow2-linux-e1a85694e08d03efae9e08fdb292dfd4870837bc.tar.gz kernel-qcow2-linux-e1a85694e08d03efae9e08fdb292dfd4870837bc.tar.xz kernel-qcow2-linux-e1a85694e08d03efae9e08fdb292dfd4870837bc.zip | |
isp1704_charger: Detect charger after probe
If the device is booted up with cable connected, or the
module is loaded after plugging in the cable, the
notification has come and gone, so not relying on it at
probe time. Instead this checks the VBUS level manually
after probe.
Signed-off-by: Heikki Krogerus <heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/isp1704_charger.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c index 77c11f1d72e2..2ad9b14a5ce3 100644 --- a/drivers/power/isp1704_charger.c +++ b/drivers/power/isp1704_charger.c @@ -422,6 +422,23 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev) dev_info(isp->dev, "registered with product id %s\n", isp->model); + /* + * Taking over the D+ pullup. + * + * FIXME: The device will be disconnected if it was already + * enumerated. The charger driver should be always loaded before any + * gadget is loaded. + */ + if (isp->otg->gadget) + usb_gadget_disconnect(isp->otg->gadget); + + /* Detect charger if VBUS is valid (the cable was already plugged). */ + ret = otg_io_read(isp->otg, ULPI_USB_INT_STS); + if ((ret & ULPI_INT_VBUS_VALID) && !isp->otg->default_a) { + isp->event = USB_EVENT_VBUS; + schedule_work(&isp->work); + } + return 0; fail2: power_supply_unregister(&isp->psy); |