diff options
author | Eric Bénard <eric@eukrea.com> | 2010-06-20 21:22:54 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 14:18:04 +0200 |
commit | e8c74860a724c714fbf041a779d7cfd147145b6f (patch) | |
tree | 236579de7e908486ea1993fa8e332ed8e1e448fb /arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | |
parent | mach-cpuimx27: fix USB_ULPI build warnings (diff) | |
download | linux-e8c74860a724c714fbf041a779d7cfd147145b6f.tar.xz linux-e8c74860a724c714fbf041a779d7cfd147145b6f.zip |
eukrea_mbimx27: fix audio support when SOC is compiled as module
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to '')
-rw-r--r-- | arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c index 80f626803401..d66a6c439583 100644 --- a/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c +++ b/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c @@ -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 | |