lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: pm: sa1100: move cpu_suspend into C code

Browse Source 
We don't need a veneer for cpu_suspend, it can be called directly from
C code now.  Move it into sa11x0_pm_enter() along with the re-enabling
of clock switching.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King
2011-06-21 16:26:29 +01:00
parent 14cd8fd574
commit 34c79de6b2
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-sa1100/pm.c
View File

@@ -32,7 +32,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
extern void sa1100_cpu_suspend(long); extern void sa1100_finish_suspend(unsigned long);
#define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x #define SAVE(x) sleep_save[SLEEP_SAVE_##x] = x
#define RESTORE(x) x = sleep_save[SLEEP_SAVE_##x] #define RESTORE(x) x = sleep_save[SLEEP_SAVE_##x]
@@ -75,7 +75,7 @@ static int sa11x0_pm_enter(suspend_state_t state)
PSPR = virt_to_phys(cpu_resume); PSPR = virt_to_phys(cpu_resume);
/* go zzz */ /* go zzz */
sa1100_cpu_suspend(PLAT_PHYS_OFFSET - PAGE_OFFSET); cpu_suspend(0, PHYS_OFFSET - PAGE_OFFSET, 0, sa1100_finish_suspend);
/* /*
* Ensure not to come back here if it wasn't intended * Ensure not to come back here if it wasn't intended

11
arch/arm/mach-sa1100/sleep.S
View File

@@ -22,20 +22,13 @@
.text .text
/* /*
* sa1100_cpu_suspend() * sa1100_finish_suspend()
* *
* Causes sa11x0 to enter sleep state * Causes sa11x0 to enter sleep state
* *
*/ */
ENTRY(sa1100_cpu_suspend) ENTRY(sa1100_finish_suspend)
stmfd sp!, {r4 - r12, lr} @ save registers on stack
mov r1, r0
adr r3, BSYM(sa1100_finish_suspend)
bl cpu_suspend
ldmfd sp!, {r4 - r12, pc} @ return to caller
sa1100_finish_suspend:
@ disable clock switching @ disable clock switching
mcr p15, 0, r1, c15, c2, 2 mcr p15, 0, r1, c15, c2, 2