diff options
author | Ben Dooks <ben-linux@fluff.org> | 2005-09-03 14:39:26 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-09-03 14:39:26 -0400 |
commit | 9bed07d0fed01f7c39d128e59e5d35d7d67ff439 (patch) | |
tree | d46faa0788ddac45579b52ba9fb9313075b746c2 /arch | |
parent | f36598aeca4c2dbaa607bf6f774e38eb965402f2 (diff) |
[ARM] 2874/1: S3C2410 - add cpu_init() call after sleep wakeup
Patch from Ben Dooks
The power management sleep code needs to call cpu_init()
to restore the cpu state after the system resumes from
suspend. Also clear off an un-necessary comment.
Thanks to Dimitry Andric for reporting the bug and
for rmk for pointing out the cause.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-s3c2410/pm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2410/pm.c b/arch/arm/mach-s3c2410/pm.c index 13a48ee77484..fe57d966a34d 100644 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c | |||
@@ -585,14 +585,16 @@ static int s3c2410_pm_enter(suspend_state_t state) | |||
585 | 585 | ||
586 | s3c2410_pm_check_store(); | 586 | s3c2410_pm_check_store(); |
587 | 587 | ||
588 | // need to make some form of time-delta | ||
589 | |||
590 | /* send the cpu to sleep... */ | 588 | /* send the cpu to sleep... */ |
591 | 589 | ||
592 | __raw_writel(0x00, S3C2410_CLKCON); /* turn off clocks over sleep */ | 590 | __raw_writel(0x00, S3C2410_CLKCON); /* turn off clocks over sleep */ |
593 | 591 | ||
594 | s3c2410_cpu_suspend(regs_save); | 592 | s3c2410_cpu_suspend(regs_save); |
595 | 593 | ||
594 | /* restore the cpu state */ | ||
595 | |||
596 | cpu_init(); | ||
597 | |||
596 | /* unset the return-from-sleep flag, to ensure reset */ | 598 | /* unset the return-from-sleep flag, to ensure reset */ |
597 | 599 | ||
598 | tmp = __raw_readl(S3C2410_GSTATUS2); | 600 | tmp = __raw_readl(S3C2410_GSTATUS2); |