]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
eukrea_mbimx27: fix audio support when SOC is compiled as module
authorEric Bénard <eric@eukrea.com>
Sun, 20 Jun 2010 19:22:54 +0000 (21:22 +0200)
committerSascha Hauer <s.hauer@pengutronix.de>
Mon, 26 Jul 2010 12:18:04 +0000 (14:18 +0200)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c

index 80f6268034012748f51629a277d092e3a79fc5ac..d66a6c439583364b187d2406edc9e4ec076493cb 100644 (file)
@@ -96,7 +96,8 @@ static int eukrea_mbimx27_pins[] = {
        PD30_PF_CSPI1_MISO,
        PD31_PF_CSPI1_MOSI,
        /* SSI4 */
-#if defined(CONFIG_SND_SOC_EUKREA_TLV320)
+#if defined(CONFIG_SND_SOC_EUKREA_TLV320) \
+       || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE)
        PC16_PF_SSI4_FS,
        PC17_PF_SSI4_RXD | GPIO_PUEN,
        PC18_PF_SSI4_TXD | GPIO_PUEN,
@@ -333,7 +334,8 @@ void __init eukrea_mbimx27_baseboard_init(void)
        mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins,
                ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27");
 
-#if defined(CONFIG_SND_SOC_EUKREA_TLV320)
+#if defined(CONFIG_SND_SOC_EUKREA_TLV320) \
+       || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE)
        /* SSI unit master I2S codec connected to SSI_PINS_4*/
        mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
                        MXC_AUDMUX_V1_PCR_SYN |