From d04431b60f98f06151c497ce26803c0a183d369b Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Mon, 18 Jul 2011 12:25:10 +0530
Subject: [PATCH] --- yaml --- r: 281868 b: refs/heads/master c:
 72826b9f8892957156e3d390b74d8bd5e0835d51 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/arm/mach-omap2/pm44xx.c | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2bf69ac49f8b..744bd918c7be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e97ca477e993da87769f967bd6f2602a7eab9715
+refs/heads/master: 72826b9f8892957156e3d390b74d8bd5e0835d51
diff --git a/trunk/arch/arm/mach-omap2/pm44xx.c b/trunk/arch/arm/mach-omap2/pm44xx.c
index 781aadf98e32..72c745047514 100644
--- a/trunk/arch/arm/mach-omap2/pm44xx.c
+++ b/trunk/arch/arm/mach-omap2/pm44xx.c
@@ -107,6 +107,24 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
 	return pwrdm_set_next_pwrst(pwrst->pwrdm, pwrst->next_state);
 }
 
+/**
+ * omap_default_idle - OMAP4 default ilde routine.'
+ *
+ * Implements OMAP4 memory, IO ordering requirements which can't be addressed
+ * with default arch_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and
+ * by secondary CPU with CONFIG_CPUIDLE.
+ */
+static void omap_default_idle(void)
+{
+	local_irq_disable();
+	local_fiq_disable();
+
+	omap_do_wfi();
+
+	local_fiq_enable();
+	local_irq_enable();
+}
+
 /**
  * omap4_pm_init - Init routine for OMAP4 PM
  *
@@ -175,6 +193,9 @@ static int __init omap4_pm_init(void)
 	suspend_set_ops(&omap_pm_ops);
 #endif /* CONFIG_SUSPEND */
 
+	/* Overwrite the default arch_idle() */
+	pm_idle = omap_default_idle;
+
 err2:
 	return ret;
 }