---

yaml --- r: 201576 b: refs/heads/master c: e8c7486 h: refs/heads/master v: v3
git-mirror · Jul 26, 2010 · 935d53c · 935d53c
1 parent b2a4a51
commit 935d53c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbb052c905367e20c11f3b107cfe07e36dd6c8cd
+refs/heads/master: e8c74860a724c714fbf041a779d7cfd147145b6f
diff --git a/trunk/arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c b/trunk/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 |