diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:07:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:07:37 -0800 |
| commit | b01ee53dda8bd81855b7cda0dfb7f27d1524d87f (patch) | |
| tree | 71bf0730b78d686385c7a44696dcb21a5f08c8bf /arch/arm/mach-at91/pm.c | |
| parent | 8f9993f76aacfc58083fad04f8e1b6bbea33de23 (diff) | |
| parent | 00482a4078f4ff0dd0638e7f2fd83e34cc402ff7 (diff) | |
Merge branch 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
* 'at91-3.4-base+pm_cleanup' of git://github.com/at91linux/linux-at91:
ARM: at91: implement the standby function for pm/cpuidle
ARM: at91: remove wait_for_interrupt definition
ARM: at91: declare header name
ARM: at91: coding style fixes
Diffstat (limited to 'arch/arm/mach-at91/pm.c')
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 12 |
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; static int at91_pm_enter(suspend_state_t state) { - u32 saved_lpr; at91_gpio_suspend(); at91_irq_suspend(); @@ -254,16 +253,7 @@ static int at91_pm_enter(suspend_state_t state) * For ARM 926 based chips, this requirement is weaker * as at91sam9 can access a RAM in self-refresh mode. */ - asm volatile ( "mov r0, #0\n\t" - "b 1f\n\t" - ".align 5\n\t" - "1: mcr p15, 0, r0, c7, c10, 4\n\t" - : /* no output */ - : /* no input */ - : "r0"); - saved_lpr = sdram_selfrefresh_enable(); - wait_for_interrupt_enable(); - sdram_selfrefresh_disable(saved_lpr); + at91_standby(); break; case PM_SUSPEND_ON: |