From 1cb457e2e48380b2aafd095a0a84232deea93f29 Mon Sep 17 00:00:00 2001 From: Joe Honold Date: Mon, 12 Jan 2015 08:26:54 -0600 Subject: [PATCH] Add support for Z2 dock mic input. Define Mic Jack Headset (RINPUT2) and Mic Jack Dock (LINPUT2) Signed-off-by: Joe Honold --- sound/soc/pxa/z2.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 76ccb17..84c0b69 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -76,7 +76,11 @@ static struct snd_soc_jack hs_jack; /* Headset jack detection DAPM pins */ static struct snd_soc_jack_pin hs_jack_pins[] = { { - .pin = "Mic Jack", + .pin = "Mic Jack Headset", + .mask = SND_JACK_MICROPHONE, + }, + { + .pin = "Mic Jack Dock", .mask = SND_JACK_MICROPHONE, }, { @@ -104,7 +108,8 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = { /* z2 machine dapm widgets */ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = { SND_SOC_DAPM_HP("Headphone Jack", NULL), - SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_MIC("Mic Jack Headset", NULL), + SND_SOC_DAPM_MIC("Mic Jack Dock", NULL), SND_SOC_DAPM_SPK("Ext Spk", NULL), /* headset is a mic and mono headphone */ @@ -122,9 +127,13 @@ static const struct snd_soc_dapm_route z2_audio_map[] = { {"Ext Spk", NULL , "ROUT2"}, {"Ext Spk", NULL , "LOUT2"}, - /* mic is connected to R input 2 - with bias */ + /* headset mic is connected to R input 2 - with bias */ {"RINPUT2", NULL, "Mic Bias"}, - {"Mic Bias", NULL, "Mic Jack"}, + {"Mic Bias", NULL, "Mic Jack Headset"}, + + /* dock mic is connected to L input 2 - with bias */ + {"LINPUT2", NULL, "Mic Bias"}, + {"Mic Bias", NULL, "Mic Jack Dock"}, }; /* -- 1.9.1