aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-13 10:52:47 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-24 03:48:39 -0400
commitdbc125168fd7dda4ffb24a29548746c7bd3b3d87 (patch)
tree49dcd001850415d3b6789a52752fead4f33f013c /arch/arm/mach-pxa
parent3799bbe57843d279008c9ec3406838966cad5f15 (diff)
ARM: pm: move sa1100 to use proper suspend func arg0
In the previous commit, we introduced an official way to supply an argument to the suspend function. Convert the sa1100 suspend code to use this method. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/sleep.S8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index 6f5368899d84..613ddfa2c295 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -59,7 +59,7 @@ ENTRY(pxa27x_cpu_suspend)
59 mra r2, r3, acc0 59 mra r2, r3, acc0
60#endif 60#endif
61 stmfd sp!, {r2 - r12, lr} @ save registers on stack 61 stmfd sp!, {r2 - r12, lr} @ save registers on stack
62 mov r4, r0 @ save sleep mode 62 mov r2, r0 @ save sleep mode
63 ldr r3, =pxa_cpu_resume @ resume function 63 ldr r3, =pxa_cpu_resume @ resume function
64 bl cpu_suspend 64 bl cpu_suspend
65 65
@@ -67,7 +67,7 @@ ENTRY(pxa27x_cpu_suspend)
67 @ (also workaround for sighting 28071) 67 @ (also workaround for sighting 28071)
68 68
69 @ prepare value for sleep mode 69 @ prepare value for sleep mode
70 mov r1, r4 @ sleep mode 70 mov r1, r0 @ sleep mode
71 71
72 @ prepare pointer to physical address 0 (virtual mapping in generic.c) 72 @ prepare pointer to physical address 0 (virtual mapping in generic.c)
73 mov r2, #UNCACHED_PHYS_0 73 mov r2, #UNCACHED_PHYS_0
@@ -109,11 +109,11 @@ ENTRY(pxa27x_cpu_suspend)
109 109
110ENTRY(pxa25x_cpu_suspend) 110ENTRY(pxa25x_cpu_suspend)
111 stmfd sp!, {r2 - r12, lr} @ save registers on stack 111 stmfd sp!, {r2 - r12, lr} @ save registers on stack
112 mov r4, r0 @ save sleep mode 112 mov r2, r0 @ save sleep mode
113 ldr r3, =pxa_cpu_resume @ resume function 113 ldr r3, =pxa_cpu_resume @ resume function
114 bl cpu_suspend 114 bl cpu_suspend
115 @ prepare value for sleep mode 115 @ prepare value for sleep mode
116 mov r1, r4 @ sleep mode 116 mov r1, r0 @ sleep mode
117 117
118 @ prepare pointer to physical address 0 (virtual mapping in generic.c) 118 @ prepare pointer to physical address 0 (virtual mapping in generic.c)
119 mov r2, #UNCACHED_PHYS_0 119 mov r2, #UNCACHED_PHYS_0