aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/sleep.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-01-04 17:43:36 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 10:07:56 -0500
commit533462fba545d271e087c3c632cf62ff04808e40 (patch)
tree74c54d673e7dbba98755a5e59ae792cecda94424 /arch/arm/mach-pxa/sleep.S
parentf79299ca85f6f8c8817bc38494f7caa0a7043c3b (diff)
[ARM] pxa: omit PXA25x or PXA27x standby/sleep code as appropriate
There's no point building standby/sleep code for processors which aren't configured. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/sleep.S')
-rw-r--r--arch/arm/mach-pxa/sleep.S8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index f33d0c4a96d6..14bb4a93ea52 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -50,6 +50,7 @@ pxa_cpu_save_sp:
50 str r0, [r1] 50 str r0, [r1]
51 ldr pc, [sp], #4 51 ldr pc, [sp], #4
52 52
53#ifdef CONFIG_PXA27x
53/* 54/*
54 * pxa27x_cpu_suspend() 55 * pxa27x_cpu_suspend()
55 * 56 *
@@ -105,9 +106,11 @@ ENTRY(pxa27x_cpu_suspend)
105 106
106 @ align execution to a cache line 107 @ align execution to a cache line
107 b pxa_cpu_do_suspend 108 b pxa_cpu_do_suspend
109#endif
108 110
111#ifdef CONFIG_PXA25x
109/* 112/*
110 * pxa27x_cpu_suspend() 113 * pxa25x_cpu_suspend()
111 * 114 *
112 * Forces CPU into sleep state. 115 * Forces CPU into sleep state.
113 * 116 *
@@ -170,6 +173,7 @@ ENTRY(pxa25x_cpu_suspend)
170 mcr p14, 0, r0, c6, c0, 0 173 mcr p14, 0, r0, c6, c0, 0
171 orr r0, r0, #2 @ initiate change bit 174 orr r0, r0, #2 @ initiate change bit
172 b pxa_cpu_do_suspend 175 b pxa_cpu_do_suspend
176#endif
173 177
174 .ltorg 178 .ltorg
175 .align 5 179 .align 5
@@ -209,7 +213,7 @@ pxa_cpu_do_suspend:
20920: b 20b @ loop waiting for sleep 21320: b 20b @ loop waiting for sleep
210 214
211/* 215/*
212 * cpu_pxa_resume() 216 * pxa_cpu_resume()
213 * 217 *
214 * entry point from bootloader into kernel during resume 218 * entry point from bootloader into kernel during resume
215 * 219 *