]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Fri, 6 Jul 2012 13:19:12 +0000 (15:19 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 9 Jul 2012 12:07:24 +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-omap4panda.c

index 982fb2622ab83063840b61d867098b8ebf700df5..b627cdc12b84bbc15218a614cfd288abe312520e 100644 (file)
@@ -379,6 +379,9 @@ static struct omap_board_mux board_mux[] __initdata = {
        OMAP4_MUX(DPM_EMU18, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5),
        /* dispc2_data0 */
        OMAP4_MUX(DPM_EMU19, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5),
+       /* NIRQ2 for twl6040 */
+       OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 |
+                 OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };