|
@@ -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 &&
|
|
|
|
|
- musb->port_mode == MUSB_OTG)
|
|
|
|
|
|
|
+ /*
|
|
|
|
|
+ * start polling for runtime PM active and idle,
|
|
|
|
|
+ * 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)
|
|
|
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);
|