From 8abe6a2ff64a7101b3f56586e1874056f87e05ab Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nicolas.pitre@linaro.org>
Date: Tue, 2 Aug 2011 12:22:48 -0400
Subject: [PATCH] --- yaml --- r: 295323 b: refs/heads/master c:
 71e256c54d67f55536bae184bb579c682714a95a h: refs/heads/master i:   295321:
 2adcfb8a618397690c8bb199b695f53325aafea4   295319:
 6e7bd90dc36a21384b966a68abcc27304e7ce234 v: v3

---
 [refs]                                           |  2 +-
 trunk/arch/arm/mach-clps711x/common.c            | 16 ++++++++++++++++
 .../arch/arm/mach-clps711x/include/mach/system.h |  5 +----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e7d0b4c5b589..c62b120c09cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9dfafbaca0b66a6665242d019b3b9c5be056fcf
+refs/heads/master: 71e256c54d67f55536bae184bb579c682714a95a
diff --git a/trunk/arch/arm/mach-clps711x/common.c b/trunk/arch/arm/mach-clps711x/common.c
index ab1711b9b4d6..8736c1acc166 100644
--- a/trunk/arch/arm/mach-clps711x/common.c
+++ b/trunk/arch/arm/mach-clps711x/common.c
@@ -225,3 +225,19 @@ void clps711x_restart(char mode, const char *cmd)
 {
 	soft_restart(0);
 }
+
+static void clps711x_idle(void)
+{
+	clps_writel(1, HALT);
+	__asm__ __volatile__(
+	"mov    r0, r0\n\
+	mov     r0, r0");
+}
+
+static int __init clps711x_idle_init(void)
+{
+	arm_pm_idle = clps711x_idle;
+	return 0;
+}
+
+arch_initcall(clps711x_idle_init);
diff --git a/trunk/arch/arm/mach-clps711x/include/mach/system.h b/trunk/arch/arm/mach-clps711x/include/mach/system.h
index 23d6ef8c84da..0e74e1e9cc24 100644
--- a/trunk/arch/arm/mach-clps711x/include/mach/system.h
+++ b/trunk/arch/arm/mach-clps711x/include/mach/system.h
@@ -26,10 +26,7 @@
 
 static inline void arch_idle(void)
 {
-	clps_writel(1, HALT);
-	__asm__ __volatile__(
-	"mov	r0, r0\n\
-	mov	r0, r0");
+	cpu_do_idle();
 }
 
 #endif