Merge "mc1n2: add configure toggle for Sec_Fifo DAI" into cm-10.1

CyanogenMod · Jan 9, 2013 · ddc9ba7 · ddc9ba7
2 parents 5b3774b + 03c27dc
commit ddc9ba7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
@@ -127,9 +127,14 @@ config SND_SOC_SLP_TRATS_MC1N2
 config SND_SOC_SAMSUNG_USE_DMA_WRAPPER
 	bool "DMA wrapper for ALSA Platform(DMA)"
 
+config SND_SOC_SAMSUNG_SEC_FIFO
+	bool "Enable Sec_Fifo Secondary DAI"
+	depends on SND_SAMSUNG_LP || SND_SAMSUNG_ALP
+	select SND_SOC_SAMSUNG_I2S_SEC
+
 config SND_SOC_SAMSUNG_I2S_SEC
 	bool "I2S operate secondary FIFO"
-        depends on SND_SAMSUNG_LP || SND_SAMSUNG_ALP
+	depends on SND_SOC_SAMSUNG_SEC_FIFO
 
 choice
 	prompt "Samsung I2S Audio type"

diff --git a/sound/soc/samsung/srp_alp/Kconfig b/sound/soc/samsung/srp_alp/Kconfig
@@ -1,5 +1,4 @@
 config SND_SAMSUNG_ALP
 	bool "ALP Audio support"
-	select SND_SOC_SAMSUNG_I2S_SEC
 	help
 	  Say Y if you want to support ALP audio.
diff --git a/sound/soc/samsung/u1_mc1n2.c b/sound/soc/samsung/u1_mc1n2.c
@@ -191,6 +191,7 @@ static struct snd_soc_ops u1_hifi_ops = {
 
 static struct snd_soc_dai_link u1_dai[] = {
 #if defined(CONFIG_SND_SAMSUNG_LP) || defined(CONFIG_SND_SAMSUNG_ALP)
+#ifdef CONFIG_SND_SOC_SAMSUNG_SEC_FIFO
 	{ /* Sec_Fifo DAI i/f */
 		.name = "MC1N2 Sec_FIFO TX",
 		.stream_name = "Sec_Dai",
@@ -205,6 +206,7 @@ static struct snd_soc_dai_link u1_dai[] = {
 		.init = u1_hifiaudio_init,
 		.ops = &u1_hifi_ops,
 	},
+#endif
 #endif
 	{ /* Primary DAI i/f */
 		.name = "MC1N2 AIF1",