]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: Add WM8958 based headset detection on Littlemill
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 2 Dec 2011 15:55:52 +0000 (15:55 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 2 Dec 2011 17:37:38 +0000 (17:37 +0000)
The board supports CODECs that won't work with this but the CODEC driver
will check to see if it's running on the right chip for us.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/samsung/littlemill.c

index d2a44ab3c207309ba680e0e3747d41b0d07425c4..5d7680f4b7c1c0369ee15b9f48598580f8385136 100644 (file)
@@ -154,8 +154,11 @@ static struct snd_soc_dapm_route audio_paths[] = {
        { "Headphone", NULL, "HPOUT1R" },
 };
 
+static struct snd_soc_jack littlemill_headset;
+
 static int littlemill_late_probe(struct snd_soc_card *card)
 {
+       struct snd_soc_codec *codec = card->rtd[0].codec;
        struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai;
        int ret;
 
@@ -164,6 +167,18 @@ static int littlemill_late_probe(struct snd_soc_card *card)
        if (ret < 0)
                return ret;
 
+       ret = snd_soc_jack_new(codec, "Headset",
+                              SND_JACK_HEADSET | SND_JACK_MECHANICAL |
+                              SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                              SND_JACK_BTN_2 | SND_JACK_BTN_3 |
+                              SND_JACK_BTN_4 | SND_JACK_BTN_5,
+                              &littlemill_headset);
+       if (ret)
+               return ret;
+
+       /* This will check device compatibility itself */
+       wm8958_mic_detect(codec, &littlemill_headset, NULL, NULL);
+
        return 0;
 }