clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable()

omap3_noncore_dpll_enable() calls clk_get_rate(), which causes an attempt
to re-enter the clockfw_lock spinlock.  Fix by calling
omap2_get_dpll_rate() instead.

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 670c945880c045926ba7d41fc5f9e81012e5dd0d..71357db3f8d389263306376dd1b85899778ede7e 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -273,7 +273,7 @@ static int omap3_noncore_dpll_enable(struct clk *clk)
        if (clk == &dpll3_ck)
                return -EINVAL;
 
-       if (clk->parent->rate == clk_get_rate(clk))
+       if (clk->parent->rate == omap2_get_dpll_rate(clk))
                r = _omap3_noncore_dpll_bypass(clk);
        else
                r = _omap3_noncore_dpll_lock(clk);