diff options
| author | Jim Wylder <jwylder@motorola.com> | 2014-05-12 17:52:31 -0500 |
|---|---|---|
| committer | Jim Wylder <jwylder@motorola.com> | 2014-05-12 17:52:31 -0500 |
| commit | 7be3e53f2d72ba5a931397c92c38a0d31f97c48f (patch) | |
| tree | baf5d4dfa53eaacc08ed207e29db2078aaafff22 /arch/arm/mach-omap2/pm34xx.c | |
| parent | 0836c4b0758d484fcd328c3cd906fede829db2b4 (diff) | |
| download | olio-linux-3.10-7be3e53f2d72ba5a931397c92c38a0d31f97c48f.tar.xz olio-linux-3.10-7be3e53f2d72ba5a931397c92c38a0d31f97c48f.zip | |
Revert "IKXCLOCK-1044 arm: omap2: enable OMAP offmode"
This reverts commit 45c7061a5c2c4ac7e4e2f0c01e2db05e7c4a0b0a.
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 844b10723a2..23eb24308cc 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -39,7 +39,6 @@ #include "clockdomain.h" #include "powerdomain.h" -#include "omap-pm.h" #include "soc.h" #include "common.h" #include "cm3xxx.h" @@ -52,7 +51,6 @@ #include "sram.h" #include "control.h" #include "pm-debug-regs.h" -#include "iomap.h" /* pm34xx errata defined in pm.h */ u16 pm34xx_errata; @@ -295,8 +293,7 @@ void omap_sram_idle(void) /* PER */ if (per_next_state < PWRDM_POWER_ON) { - per_going_off = (per_next_state == PWRDM_POWER_OFF) ? - OFF_MODE : 0; + per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0; omap2_gpio_prepare_for_idle(per_going_off); } @@ -305,9 +302,6 @@ void omap_sram_idle(void) if (core_next_state == PWRDM_POWER_OFF) { omap3_core_save_context(); omap3_cm_save_context(); - - omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_CHAIN_MASK, - WKUP_MOD, PM_WKEN); } } @@ -358,10 +352,10 @@ void omap_sram_idle(void) omap3_sram_restore_context(); omap2_sms_restore_context(); } - if (core_next_state == PWRDM_POWER_OFF) { - omap2_prm_clear_mod_reg_bits(OMAP3430_EN_IO_CHAIN_MASK, - WKUP_MOD, PM_WKEN); - } + if (core_next_state == PWRDM_POWER_OFF) + omap2_prm_clear_mod_reg_bits(OMAP3430_AUTO_OFF_MASK, + OMAP3430_GR_MOD, + OMAP3_PRM_VOLTCTRL_OFFSET); } omap3_intc_resume_idle(); @@ -681,10 +675,8 @@ static void __init pm_errata_configure(void) enable_omap3630_toggle_l2_on_restore(); if (omap_rev() < OMAP3630_REV_ES1_2) - pm34xx_errata |= PM_PER_MEMORIES_ERRATUM_i582; -#ifndef CONFIG_DISABLE_OMAP_ERRATA_i583 - pm34xx_errata |= PM_SDRC_WAKEUP_ERRATUM_i583; -#endif + pm34xx_errata |= (PM_SDRC_WAKEUP_ERRATUM_i583 | + PM_PER_MEMORIES_ERRATUM_i582); } else if (cpu_is_omap34xx()) { pm34xx_errata |= PM_PER_MEMORIES_ERRATUM_i582; } @@ -753,9 +745,6 @@ int __init omap3_pm_init(void) omap_pm_suspend = omap3_pm_suspend; #endif - if (omap_pm_get_off_mode()) - omap3_pm_off_mode_enable(true); - arm_pm_idle = omap3_pm_idle; omap3_idle_init(); |