]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Fri, 6 Jul 2012 13:19:11 +0000 (15:19 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 12:07:17 +0000 (05:07 -0700)
The sys_nirq2 is used for twl6040, make sure the pin is configured
correctly.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/board-4430sdp.c

index 8e17284a803ff0cae6ae473aced0a9793418c059..ad8a7d94afcd4b5c43f09ed3ad6e4cc02c08ea01 100644 (file)
@@ -821,6 +821,9 @@ static void __init omap_4430sdp_display_init(void)
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
        OMAP4_MUX(USBB2_ULPITLL_CLK, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
+       /* NIRQ2 for twl6040 */
+       OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 |
+                 OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };