aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock3xxx_data.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-02-25 17:49:53 -0500
committerPaul Walmsley <paul@pwsan.com>2011-02-25 18:10:42 -0500
commitc6461f5c5970833cf28c5096cdfc7a095eb3bbb5 (patch)
treec4cc4f827c7282eae12669ca30230834bc84d34a /arch/arm/mach-omap2/clock3xxx_data.c
parent70db8a6273692fdf5226c007c9882a10b3203963 (diff)
OMAP2+: clock: disable autoidle on all clocks during clock init
Disable autoidle on all clocks during clock framework initialization. (If CONFIG_PM is set, autoidle is re-enabled for all clocks later in the boot process.) The principle behind this patch, and some similar patches, is that the kernel should start with all power management features disabled. Later in the boot process, the PM code, if compiled in with CONFIG_PM, enables or re-enables power management features. Signed-off-by: Paul Walmsley <paul@pwsan.com> Tested-by: Rajendra Nayak <rnayak@ti.com> Reviewed-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/clock3xxx_data.c')
-rw-r--r--arch/arm/mach-omap2/clock3xxx_data.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 78ea7997686b..65b79e6afb53 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3538,6 +3538,9 @@ int __init omap3xxx_clk_init(void)
3538 omap2_init_clk_clkdm(c->lk.clk); 3538 omap2_init_clk_clkdm(c->lk.clk);
3539 } 3539 }
3540 3540
3541 /* Disable autoidle on all clocks; let the PM code enable it later */
3542 omap_clk_disable_autoidle_all();
3543
3541 recalculate_root_clocks(); 3544 recalculate_root_clocks();
3542 3545
3543 pr_info("Clocking rate (Crystal/Core/MPU): %ld.%01ld/%ld/%ld MHz\n", 3546 pr_info("Clocking rate (Crystal/Core/MPU): %ld.%01ld/%ld/%ld MHz\n",
@@ -3551,7 +3554,8 @@ int __init omap3xxx_clk_init(void)
3551 clk_enable_init_clocks(); 3554 clk_enable_init_clocks();
3552 3555
3553 /* 3556 /*
3554 * Lock DPLL5 and put it in autoidle. 3557 * Lock DPLL5 -- here only until other device init code can
3558 * handle this
3555 */ 3559 */
3556 if (!cpu_is_ti816x() && (omap_rev() >= OMAP3430_REV_ES2_0)) 3560 if (!cpu_is_ti816x() && (omap_rev() >= OMAP3430_REV_ES2_0))
3557 omap3_clk_lock_dpll5(); 3561 omap3_clk_lock_dpll5();