diff options
| author | Peter Ujfalusi | 2012-07-06 15:19:12 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2012-07-09 14:07:24 +0200 |
| commit | 6d2b6c9e69c99c1787f9978f9ed89231c5dbef09 (patch) | |
| tree | 282d44365392c8d6fd10abd6a2fb80f9cf3f0c66 /arch/arm/mach-omap2/board-omap4panda.c | |
| parent | ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2 (diff) | |
| download | kernel-qcow2-linux-6d2b6c9e69c99c1787f9978f9ed89231c5dbef09.tar.gz kernel-qcow2-linux-6d2b6c9e69c99c1787f9978f9ed89231c5dbef09.tar.xz kernel-qcow2-linux-6d2b6c9e69c99c1787f9978f9ed89231c5dbef09.zip | |
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 <peter.ujfalusi@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 }, }; |