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, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 7f12230fef73..666274a8b10d 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -334,7 +334,7 @@ static int omap2_dflt_clk_enable(struct clk *clk)
334 else 334 else
335 v |= (1 << clk->enable_bit); 335 v |= (1 << clk->enable_bit);
336 __raw_writel(v, clk->enable_reg); 336 __raw_writel(v, clk->enable_reg);
337 wmb(); 337 v = __raw_readl(clk->enable_reg); /* OCP barrier */
338 338
339 return 0; 339 return 0;
340} 340}
@@ -703,7 +703,7 @@ int omap2_clksel_set_rate(struct clk *clk, unsigned long rate)
703 v &= ~clk->clksel_mask; 703 v &= ~clk->clksel_mask;
704 v |= field_val << __ffs(clk->clksel_mask); 704 v |= field_val << __ffs(clk->clksel_mask);
705 __raw_writel(v, clk->clksel_reg); 705 __raw_writel(v, clk->clksel_reg);
706 wmb(); 706 v = __raw_readl(clk->clksel_reg); /* OCP barrier */
707 707
708 clk->rate = clk->parent->rate / new_div; 708 clk->rate = clk->parent->rate / new_div;
709 709
@@ -788,7 +788,7 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
788 v &= ~clk->clksel_mask; 788 v &= ~clk->clksel_mask;
789 v |= field_val << __ffs(clk->clksel_mask); 789 v |= field_val << __ffs(clk->clksel_mask);
790 __raw_writel(v, clk->clksel_reg); 790 __raw_writel(v, clk->clksel_reg);
791 wmb(); 791 v = __raw_readl(clk->clksel_reg); /* OCP barrier */
792 792
793 _omap2xxx_clk_commit(clk); 793 _omap2xxx_clk_commit(clk);
794 794