summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-clps711x/common.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-23 11:59:04 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-23 11:59:13 +0000
commit34e5f4f198ddd36a82dc12164de7fc4f5430e09d (patch)
tree70a06002170ddc2a859f877564834177f0f3df5d /arch/arm/mach-clps711x/common.c
parente76f4750f4c06c8b891ae7bc4c10074de08a9d41 (diff)
parenta570067df9cc1b1821ca5255bbbe8adb67aca199 (diff)
downloadlinux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.gz
linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.tar.bz2
linux-34e5f4f198ddd36a82dc12164de7fc4f5430e09d.zip
Merge branches 'debug' and 'idle' into for-armsoc
Diffstat (limited to 'arch/arm/mach-clps711x/common.c')
-rw-r--r--arch/arm/mach-clps711x/common.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index ab1711b9b4d6..8736c1acc166 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/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);