aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-06-20 15:22:54 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2010-07-26 08:18:04 -0400
commite8c74860a724c714fbf041a779d7cfd147145b6f (patch)
tree236579de7e908486ea1993fa8e332ed8e1e448fb
parentcbb052c905367e20c11f3b107cfe07e36dd6c8cd (diff)
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>
-rw-r--r--arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c6
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[] = {
96 PD30_PF_CSPI1_MISO, 96 PD30_PF_CSPI1_MISO,
97 PD31_PF_CSPI1_MOSI, 97 PD31_PF_CSPI1_MOSI,
98 /* SSI4 */ 98 /* SSI4 */
99#if defined(CONFIG_SND_SOC_EUKREA_TLV320) 99#if defined(CONFIG_SND_SOC_EUKREA_TLV320) \
100 || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE)
100 PC16_PF_SSI4_FS, 101 PC16_PF_SSI4_FS,
101 PC17_PF_SSI4_RXD | GPIO_PUEN, 102 PC17_PF_SSI4_RXD | GPIO_PUEN,
102 PC18_PF_SSI4_TXD | GPIO_PUEN, 103 PC18_PF_SSI4_TXD | GPIO_PUEN,
@@ -333,7 +334,8 @@ void __init eukrea_mbimx27_baseboard_init(void)
333 mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins, 334 mxc_gpio_setup_multiple_pins(eukrea_mbimx27_pins,
334 ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27"); 335 ARRAY_SIZE(eukrea_mbimx27_pins), "MBIMX27");
335 336
336#if defined(CONFIG_SND_SOC_EUKREA_TLV320) 337#if defined(CONFIG_SND_SOC_EUKREA_TLV320) \
338 || defined(CONFIG_SND_SOC_EUKREA_TLV320_MODULE)
337 /* SSI unit master I2S codec connected to SSI_PINS_4*/ 339 /* SSI unit master I2S codec connected to SSI_PINS_4*/
338 mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, 340 mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
339 MXC_AUDMUX_V1_PCR_SYN | 341 MXC_AUDMUX_V1_PCR_SYN |