Commit 54578ee8 authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman

usb: musb: dsps: fix runtime pm for peripheral mode

Since the runtime PM support was added in musb, dsps relies on the timer
calling otg_timer() to activate the usb subsystem. However the driver
doesn't enable the timer for peripheral port, then the peripheral port is
unable to be enumerated by a host if the other usb port is disabled or in
peripheral mode too.

So let's start the timer for peripheral port too.

Fixes: ea2f35c0 ("usb: musb: Fix sleeping function called from invalid context for hdrc glue")
Acked-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 6010abf2
...@@ -181,9 +181,11 @@ static void dsps_musb_enable(struct musb *musb) ...@@ -181,9 +181,11 @@ static void dsps_musb_enable(struct musb *musb)
musb_writel(reg_base, wrp->epintr_set, epmask); musb_writel(reg_base, wrp->epintr_set, epmask);
musb_writel(reg_base, wrp->coreintr_set, coremask); musb_writel(reg_base, wrp->coreintr_set, coremask);
/* start polling for ID change in dual-role idle mode */ /*
if (musb->xceiv->otg->state == OTG_STATE_B_IDLE && * start polling for runtime PM active and idle,
musb->port_mode == MUSB_OTG) * and for ID change in dual-role idle mode.
*/
if (musb->xceiv->otg->state == OTG_STATE_B_IDLE)
dsps_mod_timer(glue, -1); dsps_mod_timer(glue, -1);
} }
...@@ -254,6 +256,10 @@ static int dsps_check_status(struct musb *musb, void *unused) ...@@ -254,6 +256,10 @@ static int dsps_check_status(struct musb *musb, void *unused)
musb->xceiv->otg->state = OTG_STATE_A_IDLE; musb->xceiv->otg->state = OTG_STATE_A_IDLE;
MUSB_HST_MODE(musb); MUSB_HST_MODE(musb);
} }
if (musb->port_mode == MUSB_PERIPHERAL)
skip_session = 1;
if (!(devctl & MUSB_DEVCTL_SESSION) && !skip_session) if (!(devctl & MUSB_DEVCTL_SESSION) && !skip_session)
musb_writeb(mregs, MUSB_DEVCTL, musb_writeb(mregs, MUSB_DEVCTL,
MUSB_DEVCTL_SESSION); MUSB_DEVCTL_SESSION);
......
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