* Felipe Balbi <me@xxxxxxxxxxxxxxx> [080815 10:50]: > On Fri, Aug 15, 2008 at 10:44:47AM +0300, H?gander Jouni wrote: > > Refreshed PM workaround set without coding style errors and 24xx build > > fixed. Here are instructions how to test them: > > > > To get Omap into retention, this patch set still depends on: > > 1. ARCH: OMAP: MUSB: Do not block sleep (Felipe Balbi) > > I thought it had been applied. Probably lost while tony was on > vacations. Anyways, here it is: Thanks, pushing today. Tony > From: Felipe Balbi <felipe.balbi@xxxxxxxxx> > > arch: omap: usb: do not block sleep > > musb_set_clock should not block sleep on omap3-based > boards, it prevents system from sleeping. > > Thanks to Jouni Högander for pointing this out > > Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx> > --- > > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c > index 71ddf55..3f90a93 100644 > --- a/arch/arm/mach-omap2/usb-musb.c > +++ b/arch/arm/mach-omap2/usb-musb.c > @@ -58,7 +58,6 @@ static int musb_set_clock(struct clk *clk, int state) > if (clk_on > 0) > return -ENODEV; > > - omap2_block_sleep(); > clk_enable(clk); > clk_on = 1; > } else { > @@ -67,7 +66,6 @@ static int musb_set_clock(struct clk *clk, int state) > > clk_disable(clk); > clk_on = 0; > - omap2_allow_sleep(); > } > > return 0; > > -- > balbi > -- > 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 -- 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