From 644d8959482bd3b19501e2cb0d0c15d8e013b62a Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Sun, 11 Sep 2011 17:19:11 +0800 Subject: [PATCH] --- yaml --- r: 272490 b: refs/heads/master c: ba4a90a6d86a428c295775b46e653ab8f8e459b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/include/mach/pxa27x.h | 2 ++ trunk/arch/arm/mach-pxa/z2.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad4a2134c0f2..319edb66fff1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e227e88ae46e921f608b056e27e1d8704b7d12fa +refs/heads/master: ba4a90a6d86a428c295775b46e653ab8f8e459b8 diff --git a/trunk/arch/arm/mach-pxa/include/mach/pxa27x.h b/trunk/arch/arm/mach-pxa/include/mach/pxa27x.h index b9b1bdc4bacc..7cff640582b8 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/pxa27x.h +++ b/trunk/arch/arm/mach-pxa/include/mach/pxa27x.h @@ -1,6 +1,7 @@ #ifndef __MACH_PXA27x_H #define __MACH_PXA27x_H +#include #include #include #include @@ -21,6 +22,7 @@ extern void __init pxa27x_map_io(void); extern void __init pxa27x_init_irq(void); extern int __init pxa27x_set_pwrmode(unsigned int mode); +extern void pxa27x_cpu_pm_enter(suspend_state_t state); #define pxa27x_handle_irq ichp_handle_irq diff --git a/trunk/arch/arm/mach-pxa/z2.c b/trunk/arch/arm/mach-pxa/z2.c index 6c9275a20c91..a82d4207f235 100644 --- a/trunk/arch/arm/mach-pxa/z2.c +++ b/trunk/arch/arm/mach-pxa/z2.c @@ -686,7 +686,8 @@ static void z2_power_off(void) */ PSPR = 0x0; local_irq_disable(); - pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET); + pxa27x_set_pwrmode(PWRMODE_DEEPSLEEP); + pxa27x_cpu_pm_enter(PM_SUSPEND_MEM); } #else #define z2_power_off NULL