diff options
author | Lesly A M <x0080970@ti.com> | 2010-02-15 13:03:35 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-15 13:03:35 -0500 |
commit | a1e63642a9ed167f74afd10245fb907ac41a54d0 (patch) | |
tree | 36d24967649e38307f35b0fbb50921a14f9aaf56 /arch/arm/mach-omap2/board-zoom-peripherals.c | |
parent | 321cfc851dbb866e4d5efd555eca5919895324ca (diff) |
omap3: pm: Add T2 Keypad as a wakeup source
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>
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-peripherals.c')
-rwxr-xr-x | arch/arm/mach-omap2/board-zoom-peripherals.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 4278d5e14bb8..9a0821fb7ea0 100755 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <plat/common.h> | 24 | #include <plat/common.h> |
25 | #include <plat/usb.h> | 25 | #include <plat/usb.h> |
26 | 26 | ||
27 | #include "mux.h" | ||
27 | #include "hsmmc.h" | 28 | #include "hsmmc.h" |
28 | 29 | ||
29 | /* Zoom2 has Qwerty keyboard*/ | 30 | /* Zoom2 has Qwerty keyboard*/ |
@@ -263,9 +264,17 @@ static int __init omap_i2c_init(void) | |||
263 | return 0; | 264 | return 0; |
264 | } | 265 | } |
265 | 266 | ||
267 | static void enable_board_wakeup_source(void) | ||
268 | { | ||
269 | /* T2 interrupt line (keypad) */ | ||
270 | omap_mux_init_signal("sys_nirq", | ||
271 | OMAP_WAKEUP_EN | OMAP_PIN_INPUT_PULLUP); | ||
272 | } | ||
273 | |||
266 | void __init zoom_peripherals_init(void) | 274 | void __init zoom_peripherals_init(void) |
267 | { | 275 | { |
268 | omap_i2c_init(); | 276 | omap_i2c_init(); |
269 | omap_serial_init(); | 277 | omap_serial_init(); |
270 | usb_musb_init(); | 278 | usb_musb_init(); |
279 | enable_board_wakeup_source(); | ||
271 | } | 280 | } |