summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
authorKalle Jokiniemi <ext-kalle.jokiniemi@nokia.com>2008-09-26 11:04:20 +0300
committerKevin Hilman <khilman@deeprootsystems.com>2009-11-11 14:42:49 -0800
commit0343371e22dcfec9291193ad3e771dbce3a93670 (patch)
tree8696dc32ae753fcf1b569f9b277190b5393e3dd9 /arch/arm/mach-omap2/pm34xx.c
parent0f724ed92b0ad152a03b7a194815787eeeec17a4 (diff)
downloadtalos-obmc-linux-0343371e22dcfec9291193ad3e771dbce3a93670.tar.gz
talos-obmc-linux-0343371e22dcfec9291193ad3e771dbce3a93670.zip
OMAP3: PM: CPUidle: fix init sequencing
Previously omap3_idle_init() was called in device_init, while omap_pm_init() is called at late_initcall. This causes the cpu idle driver to call omap_sram_idle before it is properly initialized. This patch fixes the issue by moving omap3_idle_init into omap3_pm_init. Signed-off-by: Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r--arch/arm/mach-omap2/pm34xx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 69c47edcc0f2..501b00100d59 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -1099,9 +1099,8 @@ static int __init omap3_pm_init(void)
suspend_set_ops(&omap_pm_ops);
#endif /* CONFIG_SUSPEND */
-#ifndef CONFIG_CPU_IDLE
pm_idle = omap3_pm_idle;
-#endif
+ omap3_idle_init();
pwrdm_add_wkdep(neon_pwrdm, mpu_pwrdm);
/*
OpenPOWER on IntegriCloud