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 e3a67f65d91eec88544670860e02f1f5e85c75c7..56e3441dc9772bfd6cd72d3400451cadff6d9d70 100644 (file)
--- 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()) {