소스 검색

ASoC: Hook up microphone jack detection on 1133-EV1 board

Note that since all the microphones share a bias there is a single
jack exported for all three, even though there are two physical
connectors plus the soldered down silicon mic.  Note also that the SiMic
is always present by default.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Mark Brown 15 년 전
부모
커밋
093208f5d0
1개의 변경된 파일15개의 추가작업 그리고 0개의 파일을 삭제
  1. 15 0
      sound/soc/imx/wm1133-ev1.c

+ 15 - 0
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;
 }