Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[karo-tx-linux.git] / arch / arm / mach-omap2 / board-omap4panda.c

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 982fb2622ab83063840b61d867098b8ebf700df5..70f6d1d25463d9b237a44c507d62cc5674d10780 100644 (file)
--- 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 = {
 static struct omap_abe_twl6040_data panda_abe_audio_data = {
        /* Audio out */
        .has_hs         = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
-       /* HandsFree through expasion connector */
+       /* HandsFree through expansion connector */
        .has_hf         = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
        /* PandaBoard: FM TX, PandaBoardES: can be connected to audio out */
        .has_aux        = ABE_TWL6040_LEFT | ABE_TWL6040_RIGHT,
@@ -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 },
 };