Merge tag 'v3.6-rc4' into asoc-omap

[cascardo/linux.git] / arch / arm / mach-omap2 / board-igep0020.c

diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 7491529..3613d14 100644 (file)
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -554,6 +554,8 @@ static const struct usbhs_omap_board_data igep3_usbhs_bdata __initconst = {
 
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
+       /* SMSC9221 LAN Controller ETH IRQ (GPIO_176) */
+       OMAP3_MUX(MCSPI1_CS2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
 #endif
@@ -626,6 +628,7 @@ static void __init igep_init(void)
 
        igep_flash_init();
        igep_leds_init();
+       omap_twl4030_audio_init("igep2");
 
        /*
         * WLAN-BT combo module from MuRata which has a Marvell WLAN