git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
arm
/
mach-pxa
/
sleep.S
diff --git
a/arch/arm/mach-pxa/sleep.S
b/arch/arm/mach-pxa/sleep.S
index
5786cca
..
c986268
100644
(file)
--- a/
arch/arm/mach-pxa/sleep.S
+++ b/
arch/arm/mach-pxa/sleep.S
@@
-28,7
+28,9
@@
/*
* pxa_cpu_suspend()
*
/*
* pxa_cpu_suspend()
*
- * Forces CPU into sleep state
+ * Forces CPU into sleep state.
+ *
+ * r0 = value for PWRMODE M field for desired sleep state
*/
ENTRY(pxa_cpu_suspend)
*/
ENTRY(pxa_cpu_suspend)
@@
-53,6
+55,7
@@
ENTRY(pxa_cpu_suspend)
mov r10, sp
stmfd sp!, {r3 - r10}
mov r10, sp
stmfd sp!, {r3 - r10}
+ mov r5, r0 @ save sleep mode
@ preserve phys address of stack
mov r0, sp
bl sleep_phys_sp
@ preserve phys address of stack
mov r0, sp
bl sleep_phys_sp
@@
-66,7
+69,7
@@
ENTRY(pxa_cpu_suspend)
@ (also workaround for sighting 28071)
@ prepare value for sleep mode
@ (also workaround for sighting 28071)
@ prepare value for sleep mode
- mov r1,
#3
@ sleep mode
+ mov r1,
r5
@ sleep mode
@ prepare pointer to physical address 0 (virtual mapping in generic.c)
mov r2, #UNCACHED_PHYS_0
@ prepare pointer to physical address 0 (virtual mapping in generic.c)
mov r2, #UNCACHED_PHYS_0