summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishwanath BS <vishwanath.bs@ti.com>2012-05-02 02:44:40 -0600
committerPaul Walmsley <paul@pwsan.com>2012-06-22 08:40:36 -0600
commitfafcdd53220f44d7ae2f06a9ce20c8d550df2d9b (patch)
treeb64f96b541799ba7aa98df3a33c06e10192f58d8
parent5165882a387325ac0df2f30c62ea710cfa328b54 (diff)
downloadop-kernel-dev-fafcdd53220f44d7ae2f06a9ce20c8d550df2d9b.zip
op-kernel-dev-fafcdd53220f44d7ae2f06a9ce20c8d550df2d9b.tar.gz
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>
-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 9d6cb7c..9d8258f 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/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]);
}
OpenPOWER on IntegriCloud