Skip to content

Commit

Permalink
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vishwanath BS authored and Paul Walmsley committed Jun 22, 2012
1 parent 5165882 commit fafcdd5
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions arch/arm/mach-omap2/pm34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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]);
}

Expand Down

0 comments on commit fafcdd5

Please sign in to comment.