From 0e6c266b5e6ab208d72dcc165a4ec5bd8d35ff36 Mon Sep 17 00:00:00 2001 From: Lesly A M Date: Mon, 15 Feb 2010 10:03:35 -0800 Subject: [PATCH] --- yaml --- r: 184720 b: refs/heads/master c: a1e63642a9ed167f74afd10245fb907ac41a54d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-zoom-peripherals.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 40295e8cd290..537d0f5ce4bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 321cfc851dbb866e4d5efd555eca5919895324ca +refs/heads/master: a1e63642a9ed167f74afd10245fb907ac41a54d0 diff --git a/trunk/arch/arm/mach-omap2/board-zoom-peripherals.c b/trunk/arch/arm/mach-omap2/board-zoom-peripherals.c index 4278d5e14bb8..9a0821fb7ea0 100755 --- a/trunk/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/trunk/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -24,6 +24,7 @@ #include #include +#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(); }