From: Peter Ujfalusi Date: Fri, 6 Jul 2012 13:19:12 +0000 (+0200) Subject: ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2 X-Git-Tag: firefly_0821_release~3680^2~2394^2~3^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6d2b6c9e69c99c1787f9978f9ed89231c5dbef09;p=firefly-linux-kernel-4.4.55.git ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2 The sys_nirq2 is used for twl6040, make sure the pin is configured correctly. Signed-off-by: Peter Ujfalusi Acked-by: Santosh Shilimkar Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 982fb2622ab8..b627cdc12b84 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -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 }, };