<snip> > > > @@ -496,6 +497,11 @@ void omap_sram_idle(void) > > > omap3_prcm_restore_context(); > > > omap3_sram_restore_context(); > > > omap2_sms_restore_context(); > > > + /* > > > + * Errata 1.164 fix : OTG autoidle can prevent > > > + * sleep > > > + */ > > > + usb_musb_disable_autoidle(); > > > > NAK. This belongs in the MUSB driver, not in the idle path. > > > > Kevin, > > When we exit off-mode, the autoidle will get enabled, and needs > an explicit disable. If the MUSB driver is not loaded, there will > be no one to do this. > > - Anand > > > Kevin > > > > > } > > > omap_uart_resume_idle(0); > > > omap_uart_resume_idle(1); > > > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c > > > index 8dde0b7..f4b86c0 100644 > > > --- a/arch/arm/mach-omap2/usb-musb.c > > > +++ b/arch/arm/mach-omap2/usb-musb.c > > > @@ -44,10 +44,11 @@ static struct platform_device dummy_pdev = { > > > }, > > > }; > > > > > > +static void __iomem *otg_base; > > > +static struct clk *otg_clk; > > > + > > > static void __init usb_musb_pm_init(void) > > > { > > > - void __iomem *otg_base; > > > - struct clk *otg_clk; > > > struct device *dev = &dummy_pdev.dev; > > > > > > if (!cpu_is_omap34xx()) Just realized, this probably should read cpu_is_omap3430(). cpu_is_omap34xx is true for 3630 as well, and this chip doesn't need this workaround. (Won't hurt much to have this like this for now - until we switch to the CHIP_HAS_ERRATA way) - Anand -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html