From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Tue, 3 Apr 2007 12:38:26 +0000 (+0300)
Subject: ARM: OMAP: Activate MPU retention code in omap2/pm.c
X-Git-Tag: v2.6.21-omap1~37^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=252ebe1073832e4d09a81a90112a116a9c61beae;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Activate MPU retention code in omap2/pm.c

FIXME section in function omap2_allow_mpu_retention didn't allow MPU to
enter into retention even if system was idle. MPU retention works fine at
least in Nokia N800.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index cb1ae461036..ef2c0673143 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -573,8 +573,7 @@ static int omap2_allow_mpu_retention(void)
 	if (sti_console_enabled)
 		return 0;
 
-	/* FIXME: Enable soon */
-	return 0;
+	return 1;
 }
 
 static void omap2_enter_mpu_retention(void)