[PATCH] PRCM: OMAP3: Fix to wrongly modified omap2_clk_wait_ready

[PATCH] PRCM: OMAP3: Fix to wrongly modified omap2_clk_wait_ready

[Jouni Hogander]

omap2_clk_wait_ready was wrongly modified to check
registers contents. This fix changes it back to check
addresses.

Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
---
 arch/arm/mach-omap2/clock.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index d3ab537..ed15868 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -246,8 +246,8 @@ static void omap2_clk_wait_ready(struct clk *clk)
 	/* REVISIT: What are the appropriate exclusions for 34XX? */
 	/* OMAP3: ignore DSS-mod clocks */
 	if (cpu_is_omap34xx() &&
-	    ((reg & ~0xff) == cm_read_mod_reg(OMAP3430_DSS_MOD, 0) ||
-	     (((reg & ~0xff) == cm_read_mod_reg(CORE_MOD, 0)) &&
+	    ((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(OMAP3430_DSS_MOD, 0) ||
+	     (((reg & ~0xff) == (__force u32)OMAP34XX_CM_REGADDR(CORE_MOD, 0)) &&
 	      clk->enable_bit == OMAP3430_EN_SSI_SHIFT)))
 		return;
 
-- 
1.5.5

Re: [PATCH] PRCM: OMAP3: Fix to wrongly modified omap2_clk_wait_ready

[Paul Walmsley]

On Mon, 9 Jun 2008, Jouni Hogander wrote:

> omap2_clk_wait_ready was wrongly modified to check
> registers contents. This fix changes it back to check
> addresses.
> 
> Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>

Acked-by: Paul Walmsley <paul@pwsan.com>



- Paul

Re: [PATCH] PRCM: OMAP3: Fix to wrongly modified omap2_clk_wait_ready

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [080609 17:11]:
> On Mon, 9 Jun 2008, Jouni Hogander wrote:
> 
> > omap2_clk_wait_ready was wrongly modified to check
> > registers contents. This fix changes it back to check
> > addresses.
> > 
> > Signed-off-by: Jouni Hogander <jouni.hogander@nokia.com>
> 
> Acked-by: Paul Walmsley <paul@pwsan.com>

Pushing today.

Tony