diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-12 00:24:19 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-03-08 12:37:05 +0000 |
| commit | ef30e14420df546bc6576b00f9caf3379b6699d1 (patch) | |
| tree | 8037b6f610fee43c8b71088dd0a6d65d7d6df937 /arch/arm/plat-s3c | |
| parent | 4e59c25dcbc1f033d043f1009a7f6aaa1f2aef26 (diff) | |
| download | op-kernel-dev-ef30e14420df546bc6576b00f9caf3379b6699d1.zip op-kernel-dev-ef30e14420df546bc6576b00f9caf3379b6699d1.tar.gz | |
[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.h | 5 | ||||
| -rw-r--r-- | arch/arm/plat-s3c/pm.c | 3 |
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 a6104c8..f121a5a 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; /* from sleep.S */ -extern int s3c2410_cpu_save(unsigned long *saveblk); +extern int s3c_cpu_save(unsigned long *saveblk); +extern void s3c_cpu_resume(void); + extern void s3c2410_cpu_suspend(void); -extern void s3c2410_cpu_resume(void); extern unsigned long s3c_sleep_save_phys; diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c index e82ec62..e320b0f 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) * we resume as it saves its own register state, so use the return * code to differentiate return from save and return from sleep */ - if (s3c2410_cpu_save(regs_save) == 0) { + if (s3c_cpu_save(regs_save) == 0) { flush_cache_all(); + S3C_PMDBG("preparing to sleep\n"); pm_cpu_sleep(); } |
