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

Commit 77f4396e authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Felipe Balbi
Browse files

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



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: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent f5ef7b42

drivers/usb/musb/ux500.c

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

drivers/usb/phy/phy-ab8500-usb.c

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

			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 */