| Message ID | 20150224043352.4243.84042.stgit@notabene.brown (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue 2015-02-24 15:33:52, NeilBrown wrote: > If the phy has been told what current it can draw, it tells us > and now we use that number. > > Note that 'vbus_draw' is in mA, while usb_cur is in uA. > > Signed-off-by: NeilBrown <neilb@suse.de> Acked-by: Pavel Machek <pavel@ucw.cz> > @@ -609,6 +610,7 @@ static int twl4030_bci_usb_ncb(struct notifier_block *nb, unsigned long val, > void *priv) > { > struct twl4030_bci *bci = container_of(nb, struct twl4030_bci, usb_nb); > + unsigned *vbus_draw = priv; unsigned int? [Or better mA_t *? :-)] Pavel
diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c index b0242786d047..01090a440583 100644 --- a/drivers/power/twl4030_charger.c +++ b/drivers/power/twl4030_charger.c @@ -597,6 +597,7 @@ static void twl4030_bci_usb_work(struct work_struct *data) switch (bci->event) { case USB_EVENT_VBUS: case USB_EVENT_CHARGER: + case USB_EVENT_ENUMERATED: twl4030_charger_enable_usb(bci, true); break; case USB_EVENT_NONE: @@ -609,6 +610,7 @@ static int twl4030_bci_usb_ncb(struct notifier_block *nb, unsigned long val, void *priv) { struct twl4030_bci *bci = container_of(nb, struct twl4030_bci, usb_nb); + unsigned *vbus_draw = priv; dev_dbg(bci->dev, "OTG notify %lu\n", val); @@ -619,6 +621,9 @@ static int twl4030_bci_usb_ncb(struct notifier_block *nb, unsigned long val, bci->usb_cur = 100000; bci->event = val; + if (val == USB_EVENT_ENUMERATED && vbus_draw && + *vbus_draw * 1000 > bci->usb_cur) + bci->usb_cur = *vbus_draw * 1000; schedule_work(&bci->work); return NOTIFY_OK;
If the phy has been told what current it can draw, it tells us and now we use that number. Note that 'vbus_draw' is in mA, while usb_cur is in uA. Signed-off-by: NeilBrown <neilb@suse.de> --- drivers/power/twl4030_charger.c | 5 +++++ 1 file changed, 5 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html