aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm34xx.c
diff options
context:
space:
mode:
authorVishwanath BS <vishwanath.bs@ti.com>2012-05-02 04:44:40 -0400
committerPaul Walmsley <paul@pwsan.com>2012-06-22 10:40:36 -0400
commitfafcdd53220f44d7ae2f06a9ce20c8d550df2d9b (patch)
treeb64f96b541799ba7aa98df3a33c06e10192f58d8 /arch/arm/mach-omap2/pm34xx.c
parent5165882a387325ac0df2f30c62ea710cfa328b54 (diff)
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
As IO Daisy chain sequence is triggered via hwmod mux, there is no need to control it from cpuidle path for OMAP3. Also as omap3_disable_io_chain is no longer being used, just remove the function. Signed-off-by: Vishwanath BS <vishwanath.bs@ti.com> Signed-off-by: Tero Kristo <t-kristo@ti.com> Reviewed-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
-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