Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1a85694 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Anton Vorontsov
Browse files

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: default avatarHeikki Krogerus <heikki.krogerus@nokia.com>
Signed-off-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
parent a4607d9f

drivers/power/isp1704_charger.c

+17 −0
Original line number Diff line number Diff line
@@ -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);