---

yaml --- r: 248283 b: refs/heads/master c: 556e4fb h: refs/heads/master i: 248281: 5267dc5 248279: 4a196d2 v: v3
git-mirror · Apr 13, 2011 · ea1715d · ea1715d
1 parent 3268ae8
commit ea1715d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea0e60de385a984ab54d6694b03119d1706f548e
+refs/heads/master: 556e4fb1d801b0f977b1522e14fb06e2f3059f4c
diff --git a/trunk/sound/soc/samsung/speyside.c b/trunk/sound/soc/samsung/speyside.c
@@ -164,6 +164,15 @@ static struct snd_soc_dai_link speyside_dai[] = {
 		.init = speyside_wm8915_init,
 		.ops = &speyside_ops,
 	},
+	{
+		.name = "Baseband",
+		.stream_name = "Baseband",
+		.cpu_dai_name = "wm8915-aif2",
+		.codec_dai_name = "wm1250-ev1",
+		.codec_name = "wm1250-ev1.1-0027",
+		.platform_name = "samsung-audio",
+		.ops = &speyside_ops,
+	},
 };
 
 static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm)
@@ -194,6 +203,8 @@ static const struct snd_kcontrol_new controls[] = {
 	SOC_DAPM_PIN_SWITCH("Main Speaker"),
 	SOC_DAPM_PIN_SWITCH("Main DMIC"),
 	SOC_DAPM_PIN_SWITCH("Main AMIC"),
+	SOC_DAPM_PIN_SWITCH("WM1250 Input"),
+	SOC_DAPM_PIN_SWITCH("WM1250 Output"),
 };
 
 static struct snd_soc_dapm_widget widgets[] = {