OMAP3 clock: omap3_clkoutx2_recalc() should test DPLL IDLEST to determine if DPLL...

Convert the DPLL bypass test in omap3_clkoutx2_recalc() to test DPLL IDLEST
bits rather than the CM_CLKEN register.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index c5765bf892e0758eac6c0a27b326fc26391699c1..6963f2e17b1c1f27f617751700597f46e54b3229 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -577,11 +577,10 @@ static void omap3_clkoutx2_recalc(struct clk *clk)
 
        dd = pclk->dpll_data;
 
-       WARN_ON(!dd->control_reg || !dd->enable_mask);
+       WARN_ON(!dd->idlest_reg || !dd->idlest_mask);
 
-       v = __raw_readl(dd->control_reg) & dd->enable_mask;
-       v >>= __ffs(dd->enable_mask);
-       if (v != DPLL_LOCKED)
+       v = __raw_readl(dd->idlest_reg) & dd->idlest_mask;
+       if (!v)
                clk->rate = clk->parent->rate;
        else
                clk->rate = clk->parent->rate * 2;