From 58e603549e656c660c838ab97481fc1d253170f6 Mon Sep 17 00:00:00 2001
From: Jaecheol Lee <jc.lee@samsung.com>
Date: Mon, 18 Jul 2011 19:21:41 +0900
Subject: [PATCH] --- yaml --- r: 260627 b: refs/heads/master c:
 12974e9f707888044a3af3a12ebdebf0a509a1fa h: refs/heads/master i:   260625:
 ec88cf06a79b4f62c1f33891b627ac77ab6ae758   260623:
 eeb50492b2e4c7144aeb6ef21190a2a0875539d7 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/arm/mach-exynos4/pm.c | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ad7c1fb24dbf..aa91a3b9cbc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e240ab1cfbf8e341c38847fe9aee8579a01ed303
+refs/heads/master: 12974e9f707888044a3af3a12ebdebf0a509a1fa
diff --git a/trunk/arch/arm/mach-exynos4/pm.c b/trunk/arch/arm/mach-exynos4/pm.c
index 1ff290f73837..aa27b90068c0 100644
--- a/trunk/arch/arm/mach-exynos4/pm.c
+++ b/trunk/arch/arm/mach-exynos4/pm.c
@@ -209,14 +209,6 @@ static struct sleep_save exynos4_l2cc_save[] = {
 
 void exynos4_cpu_suspend(void)
 {
-	unsigned long tmp;
-
-	/* Setting Central Sequence Register for power down mode */
-
-	tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
-	tmp &= ~(S5P_CENTRAL_LOWPWR_CFG);
-	__raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
-
 	outer_flush_all();
 
 	/* issue the standby signal into the pm unit. */
@@ -299,6 +291,19 @@ static __init int exynos4_pm_drvinit(void)
 }
 arch_initcall(exynos4_pm_drvinit);
 
+static int exynos4_pm_suspend(void)
+{
+	unsigned long tmp;
+
+	/* Setting Central Sequence Register for power down mode */
+
+	tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
+	tmp &= ~S5P_CENTRAL_LOWPWR_CFG;
+	__raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+
+	return 0;
+}
+
 static void exynos4_pm_resume(void)
 {
 	unsigned long tmp;
@@ -343,6 +348,7 @@ static void exynos4_pm_resume(void)
 }
 
 static struct syscore_ops exynos4_pm_syscore_ops = {
+	.suspend	= exynos4_pm_suspend,
 	.resume		= exynos4_pm_resume,
 };