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

Commit 3063a12b authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: musb: fix PHY power on/off



commi 30a70b02 (usb: musb: fix obex in g_nokia.ko
causing kernel panic) removed phy_power_on()
and phy_power_off() calls from runtime PM callbacks
but it failed to note that the driver depended
on pm_runtime_get_sync() calls to power up the PHY,
thus leaving some platforms without any means to
have a working PHY.

Fix that by enabling the phy during omap2430_musb_init()
and killing it in omap2430_musb_exit().

Fixes: 30a70b02 (usb: musb: fix obex in g_nokia.ko causing kernel panic)
Cc: <stable@vger.kernel.org> # v3.14
Cc: Pali Rohár <pali.rohar@gmail.com>
Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Reported-by: default avatarMichael Scott <hashcode0f@gmail.com>
Tested-by: default avatarMichael Scott <hashcode0f@gmail.com>
Tested-by: default avatarStefan Roese <sr@denx.de>
Reported-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent c9eaa447
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -416,6 +416,7 @@ static int omap2430_musb_init(struct musb *musb)
		omap_musb_set_mailbox(glue);
		omap_musb_set_mailbox(glue);


	phy_init(musb->phy);
	phy_init(musb->phy);
	phy_power_on(musb->phy);


	pm_runtime_put_noidle(musb->controller);
	pm_runtime_put_noidle(musb->controller);
	return 0;
	return 0;
@@ -478,6 +479,7 @@ static int omap2430_musb_exit(struct musb *musb)
	del_timer_sync(&musb_idle_timer);
	del_timer_sync(&musb_idle_timer);


	omap2430_low_level_exit(musb);
	omap2430_low_level_exit(musb);
	phy_power_off(musb->phy);
	phy_exit(musb->phy);
	phy_exit(musb->phy);


	return 0;
	return 0;