| Message ID | 1309338303-2086-4-git-send-email-t-kristo@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kevin Hilman |
| Headers | show |
On Wed, Jun 29, 2011 at 2:34 PM, Tero Kristo <t-kristo@ti.com> wrote: > This is no longer needed as it will be handled within serial driver itself. > Can be marked as tmp same is done with uart runtime https://patchwork.kernel.org/patch/862332/ -- Thanks, Govindraj.R > Signed-off-by: Tero Kristo <t-kristo@ti.com> > --- > arch/arm/mach-omap2/pm34xx.c | 19 ------------------- > 1 files changed, 0 insertions(+), 19 deletions(-) > > diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c > index 89cf027..e626a3d 100644 > --- a/arch/arm/mach-omap2/pm34xx.c > +++ b/arch/arm/mach-omap2/pm34xx.c > @@ -335,18 +335,9 @@ void omap_sram_idle(void) > omap3_enable_io_chain(); > } > > - /* Block console output in case it is on one of the OMAP UARTs */ > - if (!is_suspending()) > - if (per_next_state < PWRDM_POWER_ON || > - core_next_state < PWRDM_POWER_ON) > - if (!console_trylock()) > - goto console_still_active; > - > /* PER */ > if (per_next_state < PWRDM_POWER_ON) { > per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0; > - omap_uart_prepare_idle(2); > - omap_uart_prepare_idle(3); > omap2_gpio_prepare_for_idle(per_going_off); > if (per_next_state == PWRDM_POWER_OFF) > omap3_per_save_context(); > @@ -354,8 +345,6 @@ void omap_sram_idle(void) > > /* CORE */ > if (core_next_state < PWRDM_POWER_ON) { > - omap_uart_prepare_idle(0); > - omap_uart_prepare_idle(1); > if (core_next_state == PWRDM_POWER_OFF) { > omap3_core_save_context(); > omap3_cm_save_context(); > @@ -402,8 +391,6 @@ void omap_sram_idle(void) > omap3_sram_restore_context(); > omap2_sms_restore_context(); > } > - omap_uart_resume_idle(0); > - omap_uart_resume_idle(1); > if (core_next_state == PWRDM_POWER_OFF) > omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK, > OMAP3430_GR_MOD, > @@ -417,14 +404,8 @@ void omap_sram_idle(void) > omap2_gpio_resume_after_idle(); > if (per_prev_state == PWRDM_POWER_OFF) > omap3_per_restore_context(); > - omap_uart_resume_idle(2); > - omap_uart_resume_idle(3); > } > > - if (!is_suspending()) > - console_unlock(); > - > -console_still_active: > /* Disable IO-PAD and IO-CHAIN wakeup */ > if (omap3_has_io_wakeup() && > (per_next_state < PWRDM_POWER_ON || > -- > 1.7.4.1 > > > Texas Instruments Oy, Tekniikantie 12, 02150 Espoo. Y-tunnus: 0115040-6. Kotipaikka: Helsinki > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 89cf027..e626a3d 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -335,18 +335,9 @@ void omap_sram_idle(void) omap3_enable_io_chain(); } - /* Block console output in case it is on one of the OMAP UARTs */ - if (!is_suspending()) - if (per_next_state < PWRDM_POWER_ON || - core_next_state < PWRDM_POWER_ON) - if (!console_trylock()) - goto console_still_active; - /* PER */ if (per_next_state < PWRDM_POWER_ON) { per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0; - omap_uart_prepare_idle(2); - omap_uart_prepare_idle(3); omap2_gpio_prepare_for_idle(per_going_off); if (per_next_state == PWRDM_POWER_OFF) omap3_per_save_context(); @@ -354,8 +345,6 @@ void omap_sram_idle(void) /* CORE */ if (core_next_state < PWRDM_POWER_ON) { - omap_uart_prepare_idle(0); - omap_uart_prepare_idle(1); if (core_next_state == PWRDM_POWER_OFF) { omap3_core_save_context(); omap3_cm_save_context(); @@ -402,8 +391,6 @@ void omap_sram_idle(void) omap3_sram_restore_context(); omap2_sms_restore_context(); } - omap_uart_resume_idle(0); - omap_uart_resume_idle(1); if (core_next_state == PWRDM_POWER_OFF) omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK, OMAP3430_GR_MOD, @@ -417,14 +404,8 @@ void omap_sram_idle(void) omap2_gpio_resume_after_idle(); if (per_prev_state == PWRDM_POWER_OFF) omap3_per_restore_context(); - omap_uart_resume_idle(2); - omap_uart_resume_idle(3); } - if (!is_suspending()) - console_unlock(); - -console_still_active: /* Disable IO-PAD and IO-CHAIN wakeup */ if (omap3_has_io_wakeup() && (per_next_state < PWRDM_POWER_ON ||
This is no longer needed as it will be handled within serial driver itself. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- arch/arm/mach-omap2/pm34xx.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-)