korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 08:14:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

usb: phy: ab8500-usb: fix last notifier arguments

Browse Source 
Fix last ab->phy.notifier call to use vbus_draw as notifier argument, as
that's used in ab8500_charger to control charging current.

Also drop a related TODO comment, and the additional
ux500_musb_set_vbus(musb, 0), as with this patch it was causing an
erratic behaviour of gadget ep0 state machine.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Fabio Baltieri 2013-04-03 10:45:10 +02:00 committed by Felipe Balbi
parent f5ef7b4282
commit 77f4396ecb
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/musb/ux500.c
View File

@ -114,7 +114,6 @@ static int musb_otg_notifications(struct notifier_block *nb,
break;
case UX500_MUSB_VBUS:
dev_dbg(musb->controller, "VBUS Connect\n");
ux500_musb_set_vbus(musb, 0);
break;
case UX500_MUSB_NONE:
dev_dbg(musb->controller, "VBUS Disconnect\n");

10
drivers/usb/phy/phy-ab8500-usb.c
View File

@ -578,16 +578,12 @@ static int ab8500_usb_set_power(struct usb_phy *phy, unsigned mA)
ab->vbus_draw = mA;
if (mA)
atomic_notifier_call_chain(&ab->phy.notifier,
UX500_MUSB_ENUMERATED, ab->phy.otg->gadget);
atomic_notifier_call_chain(&ab->phy.notifier,
UX500_MUSB_VBUS, &ab->vbus_draw);
return 0;
}
/* TODO: Implement some way for charging or other drivers to read
* ab->vbus_draw.
*/
static int ab8500_usb_set_suspend(struct usb_phy *x, int suspend)
{
/* TODO */