linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] OMAP3 clock: fix dss1_alwon_fck
@ 2008-09-25 14:08 Paul Walmsley
  2008-10-03 13:45 ` Tony Lindgren
  0 siblings, 1 reply; 2+ messages in thread
From: Paul Walmsley @ 2008-09-25 14:08 UTC (permalink / raw)
  To: linux-omap; +Cc: rnayak, Tero.Kristo


Commit a63efb1547ac35dcb0f007090396a3c7510eb691 broke the dss1_alwon_fck
clock enable on 3430ES2+.  The clock code was not waiting for the module
to come out of idle.

Problem reported by Rajendra Nayak <rnayak@ti.com>.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
---
 arch/arm/mach-omap2/clock34xx.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
index 8ce7097..4722277 100644
--- a/arch/arm/mach-omap2/clock34xx.h
+++ b/arch/arm/mach-omap2/clock34xx.h
@@ -2304,7 +2304,7 @@ static struct clk dss1_alwon_fck_3430es1 = {
 	.prcm_mod	= OMAP3430_DSS_MOD,
 	.enable_reg	= CM_FCLKEN,
 	.enable_bit	= OMAP3430_EN_DSS1_SHIFT,
-	.flags		= CLOCK_IN_OMAP343X,
+	.flags		= CLOCK_IN_OMAP3430ES1,
 	.clkdm		= { .name = "dss_clkdm" },
 	.recalc		= &followparent_recalc,
 };
@@ -2317,7 +2317,7 @@ static struct clk dss1_alwon_fck_3430es2 = {
 	.enable_reg	= CM_FCLKEN,
 	.enable_bit	= OMAP3430_EN_DSS1_SHIFT,
 	.idlest_bit	= OMAP3430ES2_ST_DSS_IDLE_SHIFT,
-	.flags		= CLOCK_IN_OMAP343X | WAIT_READY,
+	.flags		= CLOCK_IN_OMAP3430ES2 | WAIT_READY,
 	.clkdm		= { .name = "dss_clkdm" },
 	.recalc		= &followparent_recalc,
 };

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] OMAP3 clock: fix dss1_alwon_fck
  2008-09-25 14:08 [PATCH] OMAP3 clock: fix dss1_alwon_fck Paul Walmsley
@ 2008-10-03 13:45 ` Tony Lindgren
  0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2008-10-03 13:45 UTC (permalink / raw)
  To: Paul Walmsley; +Cc: linux-omap, rnayak, Tero.Kristo

* Paul Walmsley <paul@pwsan.com> [080925 17:09]:
> 
> Commit a63efb1547ac35dcb0f007090396a3c7510eb691 broke the dss1_alwon_fck
> clock enable on 3430ES2+.  The clock code was not waiting for the module
> to come out of idle.
> 
> Problem reported by Rajendra Nayak <rnayak@ti.com>.

Pushing.

Tony

> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> ---
>  arch/arm/mach-omap2/clock34xx.h |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
> index 8ce7097..4722277 100644
> --- a/arch/arm/mach-omap2/clock34xx.h
> +++ b/arch/arm/mach-omap2/clock34xx.h
> @@ -2304,7 +2304,7 @@ static struct clk dss1_alwon_fck_3430es1 = {
>  	.prcm_mod	= OMAP3430_DSS_MOD,
>  	.enable_reg	= CM_FCLKEN,
>  	.enable_bit	= OMAP3430_EN_DSS1_SHIFT,
> -	.flags		= CLOCK_IN_OMAP343X,
> +	.flags		= CLOCK_IN_OMAP3430ES1,
>  	.clkdm		= { .name = "dss_clkdm" },
>  	.recalc		= &followparent_recalc,
>  };
> @@ -2317,7 +2317,7 @@ static struct clk dss1_alwon_fck_3430es2 = {
>  	.enable_reg	= CM_FCLKEN,
>  	.enable_bit	= OMAP3430_EN_DSS1_SHIFT,
>  	.idlest_bit	= OMAP3430ES2_ST_DSS_IDLE_SHIFT,
> -	.flags		= CLOCK_IN_OMAP343X | WAIT_READY,
> +	.flags		= CLOCK_IN_OMAP3430ES2 | WAIT_READY,
>  	.clkdm		= { .name = "dss_clkdm" },
>  	.recalc		= &followparent_recalc,
>  };
> --
> 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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-10-03 13:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-25 14:08 [PATCH] OMAP3 clock: fix dss1_alwon_fck Paul Walmsley
2008-10-03 13:45 ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).