ARM: pm: convert PXA to generic suspend/resume support

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index a7a19e1cd64..1230343d9c7 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -142,8 +142,7 @@ static void pxa3xx_cpu_pm_suspend(void)
         volatile unsigned long *p = (volatile void *)0xc0000000;
         unsigned long saved_data = *p;
 
-        extern void pxa3xx_cpu_suspend(void);
-        extern void pxa3xx_cpu_resume(void);
+        extern void pxa3xx_cpu_suspend(long);
 
         /* resuming from D2 requires the HSIO2/BOOT/TPM clocks enabled */
         CKENA |= (1 << CKEN_BOOT) | (1 << CKEN_TPM);
@@ -161,9 +160,9 @@ static void pxa3xx_cpu_pm_suspend(void)
         PSPR = 0x5c014000;
 
         /* overwrite with the resume address */
-        *p = virt_to_phys(pxa3xx_cpu_resume);
+        *p = virt_to_phys(cpu_resume);
 
-        pxa3xx_cpu_suspend();
+        pxa3xx_cpu_suspend(PLAT_PHYS_OFFSET - PAGE_OFFSET);
 
         *p = saved_data;