diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-06 12:41:26 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-22 12:11:24 -0500 |
commit | 4f5ad99bb5331c571371f94ff4423cbb366c460b (patch) | |
tree | 915f4e620a5b45cdac2c8d9335410a880db71ebc /arch/arm/mach-pxa/pxa27x.c | |
parent | f6b0fa02e8b0708d17d631afce456524eadf87ff (diff) |
ARM: pm: convert PXA to generic suspend/resume support
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/pxa27x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 987301ff4c33..28b11be00b3f 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -300,7 +300,7 @@ void pxa27x_cpu_pm_enter(suspend_state_t state) | |||
300 | pxa_cpu_standby(); | 300 | pxa_cpu_standby(); |
301 | break; | 301 | break; |
302 | case PM_SUSPEND_MEM: | 302 | case PM_SUSPEND_MEM: |
303 | pxa27x_cpu_suspend(pwrmode); | 303 | pxa27x_cpu_suspend(pwrmode, PLAT_PHYS_OFFSET - PAGE_OFFSET); |
304 | break; | 304 | break; |
305 | } | 305 | } |
306 | } | 306 | } |
@@ -313,7 +313,7 @@ static int pxa27x_cpu_pm_valid(suspend_state_t state) | |||
313 | static int pxa27x_cpu_pm_prepare(void) | 313 | static int pxa27x_cpu_pm_prepare(void) |
314 | { | 314 | { |
315 | /* set resume return address */ | 315 | /* set resume return address */ |
316 | PSPR = virt_to_phys(pxa_cpu_resume); | 316 | PSPR = virt_to_phys(cpu_resume); |
317 | return 0; | 317 | return 0; |
318 | } | 318 | } |
319 | 319 | ||