diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 703bd1099259..8b43aefba0ea 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -273,7 +273,7 @@ void omap_sram_idle(void) | |||
273 | int per_next_state = PWRDM_POWER_ON; | 273 | int per_next_state = PWRDM_POWER_ON; |
274 | int core_next_state = PWRDM_POWER_ON; | 274 | int core_next_state = PWRDM_POWER_ON; |
275 | int per_going_off; | 275 | int per_going_off; |
276 | int core_prev_state, per_prev_state; | 276 | int core_prev_state; |
277 | u32 sdrc_pwr = 0; | 277 | u32 sdrc_pwr = 0; |
278 | 278 | ||
279 | mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm); | 279 | mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm); |
@@ -375,10 +375,8 @@ void omap_sram_idle(void) | |||
375 | pwrdm_post_transition(); | 375 | pwrdm_post_transition(); |
376 | 376 | ||
377 | /* PER */ | 377 | /* PER */ |
378 | if (per_next_state < PWRDM_POWER_ON) { | 378 | if (per_next_state < PWRDM_POWER_ON) |
379 | per_prev_state = pwrdm_read_prev_pwrst(per_pwrdm); | ||
380 | omap2_gpio_resume_after_idle(); | 379 | omap2_gpio_resume_after_idle(); |
381 | } | ||
382 | 380 | ||
383 | /* Disable IO-PAD and IO-CHAIN wakeup */ | 381 | /* Disable IO-PAD and IO-CHAIN wakeup */ |
384 | if (omap3_has_io_wakeup() && | 382 | if (omap3_has_io_wakeup() && |
@@ -702,7 +700,7 @@ static void __init pm_errata_configure(void) | |||
702 | static int __init omap3_pm_init(void) | 700 | static int __init omap3_pm_init(void) |
703 | { | 701 | { |
704 | struct power_state *pwrst, *tmp; | 702 | struct power_state *pwrst, *tmp; |
705 | struct clockdomain *neon_clkdm, *per_clkdm, *mpu_clkdm, *core_clkdm; | 703 | struct clockdomain *neon_clkdm, *mpu_clkdm; |
706 | int ret; | 704 | int ret; |
707 | 705 | ||
708 | if (!cpu_is_omap34xx()) | 706 | if (!cpu_is_omap34xx()) |
@@ -757,8 +755,6 @@ static int __init omap3_pm_init(void) | |||
757 | 755 | ||
758 | neon_clkdm = clkdm_lookup("neon_clkdm"); | 756 | neon_clkdm = clkdm_lookup("neon_clkdm"); |
759 | mpu_clkdm = clkdm_lookup("mpu_clkdm"); | 757 | mpu_clkdm = clkdm_lookup("mpu_clkdm"); |
760 | per_clkdm = clkdm_lookup("per_clkdm"); | ||
761 | core_clkdm = clkdm_lookup("core_clkdm"); | ||
762 | 758 | ||
763 | #ifdef CONFIG_SUSPEND | 759 | #ifdef CONFIG_SUSPEND |
764 | omap_pm_suspend = omap3_pm_suspend; | 760 | omap_pm_suspend = omap3_pm_suspend; |