[PATCH] ARCH: OMAP: MUSB: Do not block sleep

[PATCH] ARCH: OMAP: MUSB: Do not block sleep

[Felipe Balbi]

Do not block sleep while musb clock is enabled
as it completely blocks dynamic sleep.

Thanks to Jouni Högander.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Jouni Högander <jouni.hogander@nokia.com>
---
 arch/arm/mach-omap2/usb-musb.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index cbd59f8..bd3556b 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;
-- 
1.5.4.3.447.gc95b3

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARCH: OMAP: MUSB: Do not block sleep

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [080514 16:06]:
> Do not block sleep while musb clock is enabled
> as it completely blocks dynamic sleep.

Hmm, as far as I remember this will break all USB connections at least
on tusb if osc_ck is taken out. Can you check that?

Tony

> 
> Thanks to Jouni Högander.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> Signed-off-by: Jouni Högander <jouni.hogander@nokia.com>
> ---
>  arch/arm/mach-omap2/usb-musb.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
> index cbd59f8..bd3556b 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;
> -- 
> 1.5.4.3.447.gc95b3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> 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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARCH: OMAP: MUSB: Do not block sleep

[Felipe Balbi]

On Wed, May 14, 2008 at 04:12:49PM -0700, Tony Lindgren wrote:
> * Felipe Balbi <felipe.balbi@nokia.com> [080514 16:06]:
> > Do not block sleep while musb clock is enabled
> > as it completely blocks dynamic sleep.
> 
> Hmm, as far as I remember this will break all USB connections at least
> on tusb if osc_ck is taken out. Can you check that?

This doesn't touch tusb. I didn't move tusb to this generic init code so
far.

But good point. I'll move it and check.

In any case, I could block_sleep only if TUSB is been used ;-)

> 
> Tony
> 
> > 
> > Thanks to Jouni Högander.
> > 
> > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> > Signed-off-by: Jouni Högander <jouni.hogander@nokia.com>
> > ---
> >  arch/arm/mach-omap2/usb-musb.c |    2 --
> >  1 files changed, 0 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
> > index cbd59f8..bd3556b 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;
> > -- 
> > 1.5.4.3.447.gc95b3
> > 
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > 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@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Best Regards,

Felipe Balbi
me@felipebalbi.com
http://blog.felipebalbi.com
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html