Skip to content
Snippets Groups Projects
Commit dbc12516 authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 3799bbe5
No related merge requests found
...@@ -59,7 +59,7 @@ ENTRY(pxa27x_cpu_suspend) ...@@ -59,7 +59,7 @@ ENTRY(pxa27x_cpu_suspend)
mra r2, r3, acc0 mra r2, r3, acc0
#endif #endif
stmfd sp!, {r2 - r12, lr} @ save registers on stack stmfd sp!, {r2 - r12, lr} @ save registers on stack
mov r4, r0 @ save sleep mode mov r2, r0 @ save sleep mode
ldr r3, =pxa_cpu_resume @ resume function ldr r3, =pxa_cpu_resume @ resume function
bl cpu_suspend bl cpu_suspend
...@@ -67,7 +67,7 @@ ENTRY(pxa27x_cpu_suspend) ...@@ -67,7 +67,7 @@ ENTRY(pxa27x_cpu_suspend)
@ (also workaround for sighting 28071) @ (also workaround for sighting 28071)
@ prepare value for sleep mode @ prepare value for sleep mode
mov r1, r4 @ sleep mode mov r1, r0 @ sleep mode
@ prepare pointer to physical address 0 (virtual mapping in generic.c) @ prepare pointer to physical address 0 (virtual mapping in generic.c)
mov r2, #UNCACHED_PHYS_0 mov r2, #UNCACHED_PHYS_0
...@@ -109,11 +109,11 @@ ENTRY(pxa27x_cpu_suspend) ...@@ -109,11 +109,11 @@ ENTRY(pxa27x_cpu_suspend)
ENTRY(pxa25x_cpu_suspend) ENTRY(pxa25x_cpu_suspend)
stmfd sp!, {r2 - r12, lr} @ save registers on stack stmfd sp!, {r2 - r12, lr} @ save registers on stack
mov r4, r0 @ save sleep mode mov r2, r0 @ save sleep mode
ldr r3, =pxa_cpu_resume @ resume function ldr r3, =pxa_cpu_resume @ resume function
bl cpu_suspend bl cpu_suspend
@ prepare value for sleep mode @ prepare value for sleep mode
mov r1, r4 @ sleep mode mov r1, r0 @ sleep mode
@ prepare pointer to physical address 0 (virtual mapping in generic.c) @ prepare pointer to physical address 0 (virtual mapping in generic.c)
mov r2, #UNCACHED_PHYS_0 mov r2, #UNCACHED_PHYS_0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment