aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/pm34xx.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 9d6cb7cc94ab..9d8258f16666 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -272,13 +272,6 @@ void omap_sram_idle(void)
272 /* Enable IO-PAD and IO-CHAIN wakeups */ 272 /* Enable IO-PAD and IO-CHAIN wakeups */
273 per_next_state = pwrdm_read_next_pwrst(per_pwrdm); 273 per_next_state = pwrdm_read_next_pwrst(per_pwrdm);
274 core_next_state = pwrdm_read_next_pwrst(core_pwrdm); 274 core_next_state = pwrdm_read_next_pwrst(core_pwrdm);
275 if (omap3_has_io_wakeup() &&
276 (per_next_state < PWRDM_POWER_ON ||
277 core_next_state < PWRDM_POWER_ON)) {
278 omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);
279 if (omap3_has_io_chain_ctrl())
280 omap3xxx_prm_reconfigure_io_chain();
281 }
282 275
283 pwrdm_pre_transition(); 276 pwrdm_pre_transition();
284 277
@@ -351,13 +344,6 @@ void omap_sram_idle(void)
351 if (per_next_state < PWRDM_POWER_ON) 344 if (per_next_state < PWRDM_POWER_ON)
352 omap2_gpio_resume_after_idle(); 345 omap2_gpio_resume_after_idle();
353 346
354 /* Disable IO-PAD and IO-CHAIN wakeup */
355 if (omap3_has_io_wakeup() &&
356 (per_next_state < PWRDM_POWER_ON ||
357 core_next_state < PWRDM_POWER_ON))
358 omap2_prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
359 PM_WKEN);
360
361 clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]); 347 clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]);
362} 348}
363 349