diff options
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 962cfbb5500e..73a5f068e167 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -216,8 +216,6 @@ static void pxa25x_cpu_pm_restore(unsigned long *sleep_save) | |||
216 | 216 | ||
217 | static void pxa25x_cpu_pm_enter(suspend_state_t state) | 217 | static void pxa25x_cpu_pm_enter(suspend_state_t state) |
218 | { | 218 | { |
219 | CKEN = 0; | ||
220 | |||
221 | switch (state) { | 219 | switch (state) { |
222 | case PM_SUSPEND_MEM: | 220 | case PM_SUSPEND_MEM: |
223 | /* set resume return address */ | 221 | /* set resume return address */ |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index f33c9d7ff87e..db0c4c6fea9b 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -265,12 +265,6 @@ void pxa27x_cpu_pm_enter(suspend_state_t state) | |||
265 | { | 265 | { |
266 | extern void pxa_cpu_standby(void); | 266 | extern void pxa_cpu_standby(void); |
267 | 267 | ||
268 | if (state == PM_SUSPEND_STANDBY) | ||
269 | CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER) | | ||
270 | (1 << CKEN_LCD) | (1 << CKEN_PWM0); | ||
271 | else | ||
272 | CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER); | ||
273 | |||
274 | /* ensure voltage-change sequencer not initiated, which hangs */ | 268 | /* ensure voltage-change sequencer not initiated, which hangs */ |
275 | PCFR &= ~PCFR_FVC; | 269 | PCFR &= ~PCFR_FVC; |
276 | 270 | ||