Commit 17539f2f authored by Andreas Kemnade's avatar Andreas Kemnade Committed by Greg Kroah-Hartman

usb: musb: fix enumeration after resume

On dm3730 there are enumeration problems after resume.
Investigation led to the cause that the MUSB_POWER_SOFTCONN
bit is not set. If it was set before suspend (because it
was enabled via musb_pullup()), it is set in
musb_restore_context() so the pullup is enabled. But then
musb_start() is called which overwrites MUSB_POWER and
therefore disables MUSB_POWER_SOFTCONN, so no pullup is
enabled and the device is not enumerated.

So let's do a subset of what musb_start() does
in the same way as musb_suspend() does it. Platform-specific
stuff it still called as there might be some phy-related stuff
which needs to be enabled.
Also interrupts are enabled, as it was the original idea
of calling musb_start() in musb_resume() according to
Commit 6fc6f4b8 ("usb: musb: Disable interrupts on suspend,
enable them on resume")
Signed-off-by: default avatarAndreas Kemnade <andreas@kemnade.info>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fc19b1d0
...@@ -2708,7 +2708,8 @@ static int musb_resume(struct device *dev) ...@@ -2708,7 +2708,8 @@ static int musb_resume(struct device *dev)
if ((devctl & mask) != (musb->context.devctl & mask)) if ((devctl & mask) != (musb->context.devctl & mask))
musb->port1_status = 0; musb->port1_status = 0;
musb_start(musb); musb_enable_interrupts(musb);
musb_platform_enable(musb);
spin_lock_irqsave(&musb->lock, flags); spin_lock_irqsave(&musb->lock, flags);
error = musb_run_resume_work(musb); error = musb_run_resume_work(musb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment