aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/pm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-at91/pm.c')
-rw-r--r--arch/arm/mach-at91/pm.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 87be5aa18753..d554e6771b4e 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -198,7 +198,6 @@ extern u32 at91_slow_clock_sz;
198 198
199static int at91_pm_enter(suspend_state_t state) 199static int at91_pm_enter(suspend_state_t state)
200{ 200{
201 u32 saved_lpr;
202 at91_gpio_suspend(); 201 at91_gpio_suspend();
203 at91_irq_suspend(); 202 at91_irq_suspend();
204 203
@@ -254,16 +253,7 @@ static int at91_pm_enter(suspend_state_t state)
254 * For ARM 926 based chips, this requirement is weaker 253 * For ARM 926 based chips, this requirement is weaker
255 * as at91sam9 can access a RAM in self-refresh mode. 254 * as at91sam9 can access a RAM in self-refresh mode.
256 */ 255 */
257 asm volatile ( "mov r0, #0\n\t" 256 at91_standby();
258 "b 1f\n\t"
259 ".align 5\n\t"
260 "1: mcr p15, 0, r0, c7, c10, 4\n\t"
261 : /* no output */
262 : /* no input */
263 : "r0");
264 saved_lpr = sdram_selfrefresh_enable();
265 wait_for_interrupt_enable();
266 sdram_selfrefresh_disable(saved_lpr);
267 break; 257 break;
268 258
269 case PM_SUSPEND_ON: 259 case PM_SUSPEND_ON: