]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[ARM] omap: fix clock reparenting in omap2_clk_set_parent()
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 19 Feb 2009 13:25:16 +0000 (13:25 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 19 Feb 2009 13:25:16 +0000 (13:25 +0000)
When changing the parent of a clock, it is necessary to keep the
clock use counts balanced otherwise things the parent state will
get corrupted.  Since we already disable and re-enable the clock,
we might as well use the recursive versions instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-omap2/clock.c

index e64549e4e3267822d15d230daa428f3932c04de1..ce4d46a4a8381d2bd2b0cff19f840ae16ac2c153 100644 (file)
@@ -746,7 +746,7 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
                return -EINVAL;
 
        if (clk->usecount > 0)
-               _omap2_clk_disable(clk);
+               omap2_clk_disable(clk);
 
        /* Set new source value (previous dividers if any in effect) */
        reg_val = __raw_readl(src_addr) & ~field_mask;
@@ -759,11 +759,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
                wmb();
        }
 
-       if (clk->usecount > 0)
-               _omap2_clk_enable(clk);
-
        clk->parent = new_parent;
 
+       if (clk->usecount > 0)
+               omap2_clk_enable(clk);
+
        /* CLKSEL clocks follow their parents' rates, divided by a divisor */
        clk->rate = new_parent->rate;