aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock24xx.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/clock24xx.c')
-rw-r--r--arch/arm/mach-omap2/clock24xx.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 866a618c4d8d..3a0a1b8aa0bb 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -199,8 +199,6 @@ long omap2_dpllcore_round_rate(unsigned long target_rate)
199static void omap2_dpllcore_recalc(struct clk *clk) 199static void omap2_dpllcore_recalc(struct clk *clk)
200{ 200{
201 clk->rate = omap2_get_dpll_rate_24xx(clk); 201 clk->rate = omap2_get_dpll_rate_24xx(clk);
202
203 propagate_rate(clk);
204} 202}
205 203
206static int omap2_reprogram_dpllcore(struct clk *clk, unsigned long rate) 204static int omap2_reprogram_dpllcore(struct clk *clk, unsigned long rate)
@@ -442,13 +440,11 @@ static u32 omap2_get_sysclkdiv(void)
442static void omap2_osc_clk_recalc(struct clk *clk) 440static void omap2_osc_clk_recalc(struct clk *clk)
443{ 441{
444 clk->rate = omap2_get_apll_clkin() * omap2_get_sysclkdiv(); 442 clk->rate = omap2_get_apll_clkin() * omap2_get_sysclkdiv();
445 propagate_rate(clk);
446} 443}
447 444
448static void omap2_sys_clk_recalc(struct clk *clk) 445static void omap2_sys_clk_recalc(struct clk *clk)
449{ 446{
450 clk->rate = clk->parent->rate / omap2_get_sysclkdiv(); 447 clk->rate = clk->parent->rate / omap2_get_sysclkdiv();
451 propagate_rate(clk);
452} 448}
453 449
454/* 450/*
@@ -502,7 +498,9 @@ int __init omap2_clk_init(void)
502 clk_init(&omap2_clk_functions); 498 clk_init(&omap2_clk_functions);
503 499
504 omap2_osc_clk_recalc(&osc_ck); 500 omap2_osc_clk_recalc(&osc_ck);
501 propagate_rate(&osc_ck);
505 omap2_sys_clk_recalc(&sys_ck); 502 omap2_sys_clk_recalc(&sys_ck);
503 propagate_rate(&sys_ck);
506 504
507 for (clkp = onchip_24xx_clks; 505 for (clkp = onchip_24xx_clks;
508 clkp < onchip_24xx_clks + ARRAY_SIZE(onchip_24xx_clks); 506 clkp < onchip_24xx_clks + ARRAY_SIZE(onchip_24xx_clks);