PRCM: OMAP3: Fix to wrongly modified omap2_clk_wait_ready

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>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index d3ab537ee856fc03edc05dd2f77121b0565a978a..ed1586847db4dd95cff8016e4259b533f1582737 100644 (file)
--- 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;