aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/pxa25x.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-02-06 17:41:26 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-22 17:11:24 +0000
commit4f5ad99bb5331c571371f94ff4423cbb366c460b (patch)
tree915f4e620a5b45cdac2c8d9335410a880db71ebc /arch/arm/mach-pxa/pxa25x.c
parentARM: pm: add generic CPU suspend/resume support (diff)
downloadlinux-dev-4f5ad99bb5331c571371f94ff4423cbb366c460b.tar.xz
linux-dev-4f5ad99bb5331c571371f94ff4423cbb366c460b.zip
ARM: pm: convert PXA to generic suspend/resume support
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to '')
-rw-r--r--arch/arm/mach-pxa/pxa25x.c4
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)
switch (state) {
case PM_SUSPEND_MEM:
- pxa25x_cpu_suspend(PWRMODE_SLEEP);
+ pxa25x_cpu_suspend(PWRMODE_SLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET);
break;
}
}
@@ -252,7 +252,7 @@ static void pxa25x_cpu_pm_enter(suspend_state_t state)
static int pxa25x_cpu_pm_prepare(void)
{
/* set resume return address */
- PSPR = virt_to_phys(pxa_cpu_resume);
+ PSPR = virt_to_phys(cpu_resume);
return 0;
}