diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/usb/musb/ux500.c | 1 | ||||
-rw-r--r-- | drivers/usb/phy/phy-ab8500-usb.c | 10 |
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index 88795f532370..2c80004e0a83 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c | |||
@@ -114,7 +114,6 @@ static int musb_otg_notifications(struct notifier_block *nb, | |||
114 | break; | 114 | break; |
115 | case UX500_MUSB_VBUS: | 115 | case UX500_MUSB_VBUS: |
116 | dev_dbg(musb->controller, "VBUS Connect\n"); | 116 | dev_dbg(musb->controller, "VBUS Connect\n"); |
117 | ux500_musb_set_vbus(musb, 0); | ||
118 | break; | 117 | break; |
119 | case UX500_MUSB_NONE: | 118 | case UX500_MUSB_NONE: |
120 | dev_dbg(musb->controller, "VBUS Disconnect\n"); | 119 | dev_dbg(musb->controller, "VBUS Disconnect\n"); |
diff --git a/drivers/usb/phy/phy-ab8500-usb.c b/drivers/usb/phy/phy-ab8500-usb.c index fec260ee67d3..888dad65bf9b 100644 --- a/drivers/usb/phy/phy-ab8500-usb.c +++ b/drivers/usb/phy/phy-ab8500-usb.c | |||
@@ -578,16 +578,12 @@ static int ab8500_usb_set_power(struct usb_phy *phy, unsigned mA) | |||
578 | 578 | ||
579 | ab->vbus_draw = mA; | 579 | ab->vbus_draw = mA; |
580 | 580 | ||
581 | if (mA) | 581 | atomic_notifier_call_chain(&ab->phy.notifier, |
582 | atomic_notifier_call_chain(&ab->phy.notifier, | 582 | UX500_MUSB_VBUS, &ab->vbus_draw); |
583 | UX500_MUSB_ENUMERATED, ab->phy.otg->gadget); | 583 | |
584 | return 0; | 584 | return 0; |
585 | } | 585 | } |
586 | 586 | ||
587 | /* TODO: Implement some way for charging or other drivers to read | ||
588 | * ab->vbus_draw. | ||
589 | */ | ||
590 | |||
591 | static int ab8500_usb_set_suspend(struct usb_phy *x, int suspend) | 587 | static int ab8500_usb_set_suspend(struct usb_phy *x, int suspend) |
592 | { | 588 | { |
593 | /* TODO */ | 589 | /* TODO */ |