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/pxa25x.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/pxa25x.c')
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index fbc5b775f895..0727e48a97ff 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -244,7 +244,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state) | |||
244 | 244 | ||
245 | switch (state) { | 245 | switch (state) { |
246 | case PM_SUSPEND_MEM: | 246 | case PM_SUSPEND_MEM: |
247 | pxa25x_cpu_suspend(PWRMODE_SLEEP); | 247 | pxa25x_cpu_suspend(PWRMODE_SLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET); |
248 | break; | 248 | break; |
249 | } | 249 | } |
250 | } | 250 | } |
@@ -252,7 +252,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state) | |||
252 | static int pxa25x_cpu_pm_prepare(void) | 252 | static int pxa25x_cpu_pm_prepare(void) |
253 | { | 253 | { |
254 | /* set resume return address */ | 254 | /* set resume return address */ |
255 | PSPR = virt_to_phys(pxa_cpu_resume); | 255 | PSPR = virt_to_phys(cpu_resume); |
256 | return 0; | 256 | return 0; |
257 | } | 257 | } |
258 | 258 | ||