Skip to content

Commit

Permalink
ARM: pm: move sa1100 to use proper suspend func arg0
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Jun 24, 2011
1 parent 3799bbe commit dbc1251
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/arm/mach-pxa/sleep.S
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ ENTRY(pxa27x_cpu_suspend)
mra r2, r3, acc0
#endif
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
bl cpu_suspend

@ Put the processor to sleep
@ (also workaround for sighting 28071)

@ 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)
mov r2, #UNCACHED_PHYS_0
Expand Down Expand Up @@ -109,11 +109,11 @@ ENTRY(pxa27x_cpu_suspend)

ENTRY(pxa25x_cpu_suspend)
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
bl cpu_suspend
@ 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)
mov r2, #UNCACHED_PHYS_0
Expand Down

0 comments on commit dbc1251

Please sign in to comment.