From 88b5d9b6872be2d944895ca0f6c236f262e4e8d3 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Thu, 18 Sep 2008 10:30:28 -0600 Subject: [PATCH] OMAP3 clock: omap3_clkoutx2_recalc() should test DPLL IDLEST to determine if DPLL is bypassed 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/clock34xx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c index c5765bf892e..6963f2e17b1 100644 --- 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; -- 2.41.1