Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bed07d0 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f36598ae
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -585,14 +585,16 @@ static int s3c2410_pm_enter(suspend_state_t state)

	s3c2410_pm_check_store();

	// need to make some form of time-delta

	/* send the cpu to sleep... */

	__raw_writel(0x00, S3C2410_CLKCON);  /* turn off clocks over sleep */

	s3c2410_cpu_suspend(regs_save);

	/* restore the cpu state */

	cpu_init();

	/* unset the return-from-sleep flag, to ensure reset */

	tmp = __raw_readl(S3C2410_GSTATUS2);