aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
-rw-r--r--arch/arm/mach-omap2/clock.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 40cb65ba1fac..f49bce997a0b 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -807,9 +807,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
807 if (!parent_div) 807 if (!parent_div)
808 return -EINVAL; 808 return -EINVAL;
809 809
810 if (clk->usecount > 0)
811 _omap2_clk_disable(clk);
812
813 /* Set new source value (previous dividers if any in effect) */ 810 /* Set new source value (previous dividers if any in effect) */
814 v = __raw_readl(clk->clksel_reg); 811 v = __raw_readl(clk->clksel_reg);
815 v &= ~clk->clksel_mask; 812 v &= ~clk->clksel_mask;
@@ -819,9 +816,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
819 816
820 _omap2xxx_clk_commit(clk); 817 _omap2xxx_clk_commit(clk);
821 818
822 if (clk->usecount > 0)
823 _omap2_clk_enable(clk);
824
825 clk_reparent(clk, new_parent); 819 clk_reparent(clk, new_parent);
826 820
827 /* CLKSEL clocks follow their parents' rates, divided by a divisor */ 821 /* CLKSEL clocks follow their parents' rates, divided by a divisor */