diff options
author | Kalle Jokiniemi <ext-kalle.jokiniemi@nokia.com> | 2008-09-26 04:04:20 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-11-11 17:42:49 -0500 |
commit | 0343371e22dcfec9291193ad3e771dbce3a93670 (patch) | |
tree | 8696dc32ae753fcf1b569f9b277190b5393e3dd9 /arch/arm/mach-omap2/pm34xx.c | |
parent | 0f724ed92b0ad152a03b7a194815787eeeec17a4 (diff) |
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.c | 3 |
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) | |||
1099 | suspend_set_ops(&omap_pm_ops); | 1099 | suspend_set_ops(&omap_pm_ops); |
1100 | #endif /* CONFIG_SUSPEND */ | 1100 | #endif /* CONFIG_SUSPEND */ |
1101 | 1101 | ||
1102 | #ifndef CONFIG_CPU_IDLE | ||
1103 | pm_idle = omap3_pm_idle; | 1102 | pm_idle = omap3_pm_idle; |
1104 | #endif | 1103 | omap3_idle_init(); |
1105 | 1104 | ||
1106 | pwrdm_add_wkdep(neon_pwrdm, mpu_pwrdm); | 1105 | pwrdm_add_wkdep(neon_pwrdm, mpu_pwrdm); |
1107 | /* | 1106 | /* |