Skip to content

Commit

Permalink
ASoC: Add WM8958 based headset detection on Littlemill
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Dec 2, 2011
1 parent 3631e8d commit f2e2026
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions sound/soc/samsung/littlemill.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
}

Expand Down

0 comments on commit f2e2026

Please sign in to comment.