aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-12-11 19:24:19 -0500
committerBen Dooks <ben-linux@fluff.org>2009-03-08 08:37:05 -0400
commitef30e14420df546bc6576b00f9caf3379b6699d1 (patch)
tree8037b6f610fee43c8b71088dd0a6d65d7d6df937 /arch/arm/plat-s3c
parent4e59c25dcbc1f033d043f1009a7f6aaa1f2aef26 (diff)
[ARM] S3C: Rename sleep.S functions to be non-cpu specific
Rename s3c2410_cpu_resume to s3c_cpu_resume and s3c2410_cpu_save to s3c_cpu_save to remove the CPU specific naming of these functions which are now in the generic PM code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/plat-s3c')
-rw-r--r--arch/arm/plat-s3c/include/plat/pm.h5
-rw-r--r--arch/arm/plat-s3c/pm.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-s3c/include/plat/pm.h b/arch/arm/plat-s3c/include/plat/pm.h
index a6104c8055ff..f121a5ac7420 100644
--- a/arch/arm/plat-s3c/include/plat/pm.h
+++ b/arch/arm/plat-s3c/include/plat/pm.h
@@ -46,9 +46,10 @@ extern unsigned long s3c_pm_flags;
46 46
47/* from sleep.S */ 47/* from sleep.S */
48 48
49extern int s3c2410_cpu_save(unsigned long *saveblk); 49extern int s3c_cpu_save(unsigned long *saveblk);
50extern void s3c_cpu_resume(void);
51
50extern void s3c2410_cpu_suspend(void); 52extern void s3c2410_cpu_suspend(void);
51extern void s3c2410_cpu_resume(void);
52 53
53extern unsigned long s3c_sleep_save_phys; 54extern unsigned long s3c_sleep_save_phys;
54 55
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c
index e82ec628ced1..e320b0ff3852 100644
--- a/arch/arm/plat-s3c/pm.c
+++ b/arch/arm/plat-s3c/pm.c
@@ -280,8 +280,9 @@ static int s3c_pm_enter(suspend_state_t state)
280 * we resume as it saves its own register state, so use the return 280 * we resume as it saves its own register state, so use the return
281 * code to differentiate return from save and return from sleep */ 281 * code to differentiate return from save and return from sleep */
282 282
283 if (s3c2410_cpu_save(regs_save) == 0) { 283 if (s3c_cpu_save(regs_save) == 0) {
284 flush_cache_all(); 284 flush_cache_all();
285 S3C_PMDBG("preparing to sleep\n");
285 pm_cpu_sleep(); 286 pm_cpu_sleep();
286 } 287 }
287 288