]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
omap3: pm: Add T2 Keypad as a wakeup source
authorLesly A M <x0080970@ti.com>
Mon, 15 Feb 2010 18:03:35 +0000 (10:03 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 15 Feb 2010 18:03:35 +0000 (10:03 -0800)
Changes for setting the padconf value for sys_nirq line which is
connected to T2 INTR1. This will fix the T2 keypad wakeup.

Signed-off-by: Lesly A M <x0080970@ti.com>
Signed-off-by: Teerth Reddy <teerth@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-zoom-peripherals.c

index 4278d5e14bb81130c869a2758f629693bbbcceaa..9a0821fb7ea03d716ffddf78627c15894d3c20d4 100755 (executable)
@@ -24,6 +24,7 @@
 #include <plat/common.h>
 #include <plat/usb.h>
 
+#include "mux.h"
 #include "hsmmc.h"
 
 /* Zoom2 has Qwerty keyboard*/
@@ -263,9 +264,17 @@ static int __init omap_i2c_init(void)
        return 0;
 }
 
+static void enable_board_wakeup_source(void)
+{
+       /* T2 interrupt line (keypad) */
+       omap_mux_init_signal("sys_nirq",
+               OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP);
+}
+
 void __init zoom_peripherals_init(void)
 {
        omap_i2c_init();
        omap_serial_init();
        usb_musb_init();
+       enable_board_wakeup_source();
 }