diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2007-07-18 06:40:13 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-20 12:25:20 -0400 |
commit | b750a09385d7c464113ae8915e63541a163fbac8 (patch) | |
tree | cf7204368ff629ff00cecdabe8bc0e2ba3a82c85 /arch/arm/mach-pxa/pxa27x.c | |
parent | 711be5ccfe9a02ba560aa918a008c31ea4760163 (diff) |
[ARM] 4489/1: pxa: split pxa_cpu_suspend to processor specific ones
1. split pxa_cpu_suspend to pxa25x_cpu_suspend and pxa27x_cpu_suspend
and make pxa25x_cpu_pm_enter() and pxa27x_cpu_pm_enter() to invoke
the corresponding _suspend functions, thus remove all those ugly
#ifdef .. #endif out of sleep.S
2. move the declarations of those suspend functions to pm.h
note: this is not a clean enough solution until all the pxa25x and
pxa27x specific part is further removed out of sleep.S, sleep.S is
supposed to contain generic code only
Signed-off-by: eric miao <eric.y.miao@gmail.com>
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, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 9240d37e23fa..203371ab19db 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -223,8 +223,6 @@ void pxa27x_cpu_pm_restore(unsigned long *sleep_save) | |||
223 | void pxa27x_cpu_pm_enter(suspend_state_t state) | 223 | void pxa27x_cpu_pm_enter(suspend_state_t state) |
224 | { | 224 | { |
225 | extern void pxa_cpu_standby(void); | 225 | extern void pxa_cpu_standby(void); |
226 | extern void pxa_cpu_suspend(unsigned int); | ||
227 | extern void pxa_cpu_resume(void); | ||
228 | 226 | ||
229 | if (state == PM_SUSPEND_STANDBY) | 227 | if (state == PM_SUSPEND_STANDBY) |
230 | CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER) | | 228 | CKEN = (1 << CKEN_MEMC) | (1 << CKEN_OSTIMER) | |
@@ -245,7 +243,7 @@ void pxa27x_cpu_pm_enter(suspend_state_t state) | |||
245 | case PM_SUSPEND_MEM: | 243 | case PM_SUSPEND_MEM: |
246 | /* set resume return address */ | 244 | /* set resume return address */ |
247 | PSPR = virt_to_phys(pxa_cpu_resume); | 245 | PSPR = virt_to_phys(pxa_cpu_resume); |
248 | pxa_cpu_suspend(PWRMODE_SLEEP); | 246 | pxa27x_cpu_suspend(PWRMODE_SLEEP); |
249 | break; | 247 | break; |
250 | } | 248 | } |
251 | } | 249 | } |