diff options
-rw-r--r-- | arch/arm/mach-omap2/clock24xx.c | 6 | ||||
-rw-r--r-- | arch/arm/plat-omap/clock.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index 1e839c5a28c5..984fb86349ba 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
@@ -720,14 +720,14 @@ int __init omap2_clk_init(void) | |||
720 | 720 | ||
721 | clk_init(&omap2_clk_functions); | 721 | clk_init(&omap2_clk_functions); |
722 | 722 | ||
723 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | ||
724 | clk_init_one(c->lk.clk); | ||
725 | |||
723 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); | 726 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); |
724 | propagate_rate(&osc_ck); | 727 | propagate_rate(&osc_ck); |
725 | sys_ck.rate = omap2_sys_clk_recalc(&sys_ck); | 728 | sys_ck.rate = omap2_sys_clk_recalc(&sys_ck); |
726 | propagate_rate(&sys_ck); | 729 | propagate_rate(&sys_ck); |
727 | 730 | ||
728 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | ||
729 | clk_init_one(c->lk.clk); | ||
730 | |||
731 | cpu_mask = 0; | 731 | cpu_mask = 0; |
732 | if (cpu_is_omap2420()) | 732 | if (cpu_is_omap2420()) |
733 | cpu_mask |= CK_242X; | 733 | cpu_mask |= CK_242X; |
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c index 2e0614552ac8..29efc279287a 100644 --- a/arch/arm/plat-omap/clock.c +++ b/arch/arm/plat-omap/clock.c | |||
@@ -239,6 +239,13 @@ void recalculate_root_clocks(void) | |||
239 | } | 239 | } |
240 | } | 240 | } |
241 | 241 | ||
242 | /** | ||
243 | * clk_init_one - initialize any fields in the struct clk before clk init | ||
244 | * @clk: struct clk * to initialize | ||
245 | * | ||
246 | * Initialize any struct clk fields needed before normal clk initialization | ||
247 | * can run. No return value. | ||
248 | */ | ||
242 | void clk_init_one(struct clk *clk) | 249 | void clk_init_one(struct clk *clk) |
243 | { | 250 | { |
244 | INIT_LIST_HEAD(&clk->children); | 251 | INIT_LIST_HEAD(&clk->children); |