diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-07-06 15:19:11 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-07-09 05:07:17 -0700 |
commit | c3fa201e7855ab5056c7728c9d948eee55b840b5 (patch) | |
tree | 5cfa215467243287a55a35bef2f37fdffdc06c5f /arch/arm/mach-omap2 | |
parent | 16aced80f6739beb2a6ff7b6f96c83ba80d331e8 (diff) | |
download | linux-c3fa201e7855ab5056c7728c9d948eee55b840b5.tar.bz2 |
ARM: OMAP: board-4430sdp: 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')
-rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 8e17284a803f..ad8a7d94afcd 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -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 }, }; |