summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2412/pm.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2007-12-23 05:09:34 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-28 16:20:50 +0300
commit332349518f1958b0bc1ae3febc2e4f75f214d255 (patch)
tree5bbf5aa0c1ab02dbee30fdf46d0043dfc52a5ce3 /arch/arm/mach-s3c2412/pm.c
parent0baada2742a42390a2ebed09e07e1fab518db884 (diff)
downloadlinux-332349518f1958b0bc1ae3febc2e4f75f214d255.tar.xz
[ARM] 4731/1: S3C2412: Check for incomplete sleep
Check if the sleep command returns due to a pending interrupt in the standby unit. If this happens, try and ack the IRQ before re-trying the resume. It is currently unclear whether the resume can be backed out of at this stage as this could cause a problem with level based interrupts. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-s3c2412/pm.c')
-rw-r--r--arch/arm/mach-s3c2412/pm.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c
index 974ffb130479..d4ffb2d98076 100644
--- a/arch/arm/mach-s3c2412/pm.c
+++ b/arch/arm/mach-s3c2412/pm.c
@@ -33,6 +33,8 @@
#include <asm/plat-s3c24xx/s3c2412.h>
+extern void s3c2412_sleep_enter(void);
+
static void s3c2412_cpu_suspend(void)
{
unsigned long tmp;
@@ -43,20 +45,7 @@ static void s3c2412_cpu_suspend(void)
tmp |= S3C2412_PWRCFG_STANDBYWFI_SLEEP;
__raw_writel(tmp, S3C2412_PWRCFG);
- /* issue the standby signal into the pm unit. Note, we
- * issue a write-buffer drain just in case */
-
- tmp = 0;
-
- asm("b 1f\n\t"
- ".align 5\n\t"
- "1:\n\t"
- "mcr p15, 0, %0, c7, c10, 4\n\t"
- "mcr p15, 0, %0, c7, c0, 4" :: "r" (tmp));
-
- /* we should never get past here */
-
- panic("sleep resumed to originator?");
+ s3c2412_sleep_enter();
}
static void s3c2412_pm_prepare(void)