diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 982fb2622ab8..70f6d1d25463 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -106,7 +106,7 @@ static struct platform_device leds_gpio = { | |||
106 | static struct omap_abe_twl6040_data panda_abe_audio_data = { | 106 | static struct omap_abe_twl6040_data panda_abe_audio_data = { |
107 | /* Audio out */ | 107 | /* Audio out */ |
108 | .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 108 | .has_hs = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
109 | /* HandsFree through expasion connector */ | 109 | /* HandsFree through expansion connector */ |
110 | .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 110 | .has_hf = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
111 | /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */ | 111 | /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */ |
112 | .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, | 112 | .has_aux = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT, |
@@ -379,6 +379,9 @@ static struct omap_board_mux board_mux[] __initdata = { | |||
379 | OMAP4_MUX(DPM_EMU18, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), | 379 | OMAP4_MUX(DPM_EMU18, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), |
380 | /* dispc2_data0 */ | 380 | /* dispc2_data0 */ |
381 | OMAP4_MUX(DPM_EMU19, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), | 381 | OMAP4_MUX(DPM_EMU19, OMAP_PIN_OUTPUT | OMAP_MUX_MODE5), |
382 | /* NIRQ2 for twl6040 */ | ||
383 | OMAP4_MUX(SYS_NIRQ2, OMAP_MUX_MODE0 | | ||
384 | OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE), | ||
382 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 385 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
383 | }; | 386 | }; |
384 | 387 | ||