From e1d9512a8b0b73f14101b61210c1d6726b789e96 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Wed, 25 Jan 2012 00:56:07 +0100
Subject: [PATCH] --- yaml --- r: 295599 b: refs/heads/master c:
 b59160f6c017bfe33d3483ed9a6120701644af8a h: refs/heads/master i:   295597:
 b908300397f7fe2c3285dd19f05a709b810fb01d   295595:
 5ad9aef3c4638d1639aec24d46e2a21d8ca9449e   295591:
 6f5ec759d9ba5cf63c266c273e4522775506f724   295583:
 00011650a09c57a6c907c9b7a56d73ead138164d v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mach-at91/pm.c | 2 +-
 trunk/arch/arm/mach-at91/pm.h | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 9d26e4e51ba2..ea3c4c666076 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa50ae9c100225964eafc7214c70a8c08e70e50e
+refs/heads/master: b59160f6c017bfe33d3483ed9a6120701644af8a
diff --git a/trunk/arch/arm/mach-at91/pm.c b/trunk/arch/arm/mach-at91/pm.c
index 87be5aa18753..d7e8d4cbc5ef 100644
--- a/trunk/arch/arm/mach-at91/pm.c
+++ b/trunk/arch/arm/mach-at91/pm.c
@@ -262,7 +262,7 @@ static int at91_pm_enter(suspend_state_t state)
 					: /* no input */
 					: "r0");
 			saved_lpr = sdram_selfrefresh_enable();
-			wait_for_interrupt_enable();
+			cpu_do_idle();
 			sdram_selfrefresh_disable(saved_lpr);
 			break;
 
diff --git a/trunk/arch/arm/mach-at91/pm.h b/trunk/arch/arm/mach-at91/pm.h
index 715813ed73e3..38f9a13ee794 100644
--- a/trunk/arch/arm/mach-at91/pm.h
+++ b/trunk/arch/arm/mach-at91/pm.h
@@ -36,10 +36,6 @@ static inline u32 sdram_selfrefresh_enable(void)
 #define sdram_selfrefresh_disable(saved_lpr) \
 	at91_sys_write(AT91_SDRAMC_LPR, saved_lpr)
 
-#define wait_for_interrupt_enable() \
-	asm volatile ("mcr p15, 0, %0, c7, c0, 4" \
-		      : : "r" (0))
-
 #elif defined(CONFIG_ARCH_AT91SAM9G45)
 #include <mach/at91sam9_ddrsdr.h>
 
@@ -76,8 +72,6 @@ static inline u32 sdram_selfrefresh_enable(void)
 		at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1); \
 	} while (0)
 
-#define wait_for_interrupt_enable()		cpu_do_idle()
-
 #else
 #include <mach/at91sam9_sdramc.h>
 
@@ -104,9 +98,6 @@ static inline u32 sdram_selfrefresh_enable(void)
 #define sdram_selfrefresh_disable(saved_lpr) \
 	at91_ramc_write(0, AT91_SDRAMC_LPR, saved_lpr)
 
-#define wait_for_interrupt_enable() \
-	cpu_do_idle()
-
 #endif
 
 #endif