---

yaml --- r: 313557 b: refs/heads/master c: fafcdd5 h: refs/heads/master i: 313555: 675d8da v: v3
git-mirror · Jun 22, 2012 · 2e76440 · 2e76440
1 parent a2dfb1f
commit 2e76440
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5165882a387325ac0df2f30c62ea710cfa328b54
+refs/heads/master: fafcdd53220f44d7ae2f06a9ce20c8d550df2d9b
diff --git a/trunk/arch/arm/mach-omap2/pm34xx.c b/trunk/arch/arm/mach-omap2/pm34xx.c
@@ -272,13 +272,6 @@ void omap_sram_idle(void)
 	/* Enable IO-PAD and IO-CHAIN wakeups */
 	per_next_state = pwrdm_read_next_pwrst(per_pwrdm);
 	core_next_state = pwrdm_read_next_pwrst(core_pwrdm);
-	if (omap3_has_io_wakeup() &&
-	    (per_next_state < PWRDM_POWER_ON ||
-	     core_next_state < PWRDM_POWER_ON)) {
-		omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, PM_WKEN);
-		if (omap3_has_io_chain_ctrl())
-			omap3xxx_prm_reconfigure_io_chain();
-	}
 
 	pwrdm_pre_transition();
 
@@ -351,13 +344,6 @@ void omap_sram_idle(void)
 	if (per_next_state < PWRDM_POWER_ON)
 		omap2_gpio_resume_after_idle();
 
-	/* Disable IO-PAD and IO-CHAIN wakeup */
-	if (omap3_has_io_wakeup() &&
-	    (per_next_state < PWRDM_POWER_ON ||
-	     core_next_state < PWRDM_POWER_ON))
-		omap2_prm_clear_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
-					     PM_WKEN);
-
 	clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]);
 }