---

yaml --- r: 193362 b: refs/heads/master c: 093208f h: refs/heads/master v: v3
git-mirror · Mar 19, 2010 · 86c49a0 · 86c49a0
1 parent 17ba3af
commit 86c49a0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a655b96c2404245ee1c309a4b199b92812b09651
+refs/heads/master: 093208f5d03980d7216b706e3c54432d0f299e26
diff --git a/trunk/sound/soc/imx/wm1133-ev1.c b/trunk/sound/soc/imx/wm1133-ev1.c
@@ -203,6 +203,13 @@ static struct snd_soc_jack_pin hp_jack_pins[] = {
 	{ .pin = "Headphone Jack", .mask = SND_JACK_HEADPHONE },
 };
 
+static struct snd_soc_jack mic_jack;
+
+static struct snd_soc_jack_pin mic_jack_pins[] = {
+	{ .pin = "Mic1 Jack", .mask = SND_JACK_MICROPHONE },
+	{ .pin = "Mic2 Jack", .mask = SND_JACK_MICROPHONE },
+};
+
 static int wm1133_ev1_init(struct snd_soc_codec *codec)
 {
 	struct snd_soc_card *card = codec->socdev->card;
@@ -219,6 +226,14 @@ static int wm1133_ev1_init(struct snd_soc_codec *codec)
 			      hp_jack_pins);
 	wm8350_hp_jack_detect(codec, WM8350_JDR, &hp_jack, SND_JACK_HEADPHONE);
 
+	/* Microphone jack detection */
+	snd_soc_jack_new(card, "Microphone",
+			 SND_JACK_MICROPHONE | SND_JACK_BTN_0, &mic_jack);
+	snd_soc_jack_add_pins(&mic_jack, ARRAY_SIZE(mic_jack_pins),
+			      mic_jack_pins);
+	wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE,
+			       SND_JACK_BTN_0);
+
 	return 0;
 }