From: Todd Poynor <tpoynor@mvista.com>
Date: Wed, 12 Oct 2005 21:53:53 +0000 (-0700)
Subject: ARM: OMAP: Use proper register for setting OMAP730 keypad wakeup.
X-Git-Tag: v2.6.15-omap2~153
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=52d2032007981255a893111570b6e5a10183e5da;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Use proper register for setting OMAP730 keypad wakeup.

Signed-off-by: Todd Poynor <tpoynor@mvista.com>
Signed-off-by: Kevin Hilman <kevin@hilman.org>
---

diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index e3a67f65d91..56e3441dc97 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -138,9 +138,8 @@ static void omap_pm_wakeup_setup(void)
 	omap_writel(~level1_wake, OMAP_IH1_MIR);
 
 	if (cpu_is_omap730()) {
-		level2_wake |= OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD);
 		omap_writel(~level2_wake,  OMAP_IH2_0_MIR);
-		omap_writel(~OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ), OMAP_IH2_1_MIR);
+		omap_writel(~(OMAP_IRQ_BIT(INT_730_WAKE_UP_REQ) | OMAP_IRQ_BIT(INT_730_MPUIO_KEYPAD)), OMAP_IH2_1_MIR);
 	}
 
 	if (cpu_is_omap1510()) {