aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2014-06-23 09:29:42 -0400
committerMark Brown <broonie@linaro.org>2014-06-24 11:20:43 -0400
commitab6f7d0d932313cedfb1696e0536bdbe661cd9c9 (patch)
tree643a1a2f611cb84cac2f874c6e57f662d4706fa3
parent24988992932612ba1c069ad597125dbce3e19621 (diff)
ASoC: Intel: byt-max98090: Do not enable MAX98090 microphone detection
It turned out there is no need to enable microphone detection in MAX98090 codec. Headset microphone is anyway detected by a GPIO signal from another chip and headset button presses cannot be detected either because a signal needed for it is not connected. Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--sound/soc/intel/byt-max98090.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/sound/soc/intel/byt-max98090.c b/sound/soc/intel/byt-max98090.c
index 3e2e7152ae66..5cfb41ec3fab 100644
--- a/sound/soc/intel/byt-max98090.c
+++ b/sound/soc/intel/byt-max98090.c
@@ -118,13 +118,9 @@ static int byt_max98090_init(struct snd_soc_pcm_runtime *runtime)
118 if (ret) 118 if (ret)
119 return ret; 119 return ret;
120 120
121 ret = snd_soc_jack_add_gpiods(card->dev->parent, jack, 121 return snd_soc_jack_add_gpiods(card->dev->parent, jack,
122 ARRAY_SIZE(hs_jack_gpios), 122 ARRAY_SIZE(hs_jack_gpios),
123 hs_jack_gpios); 123 hs_jack_gpios);
124 if (ret)
125 return ret;
126
127 return max98090_mic_detect(codec, jack);
128} 124}
129 125
130static struct snd_soc_dai_link byt_max98090_dais[] = { 126static struct snd_soc_dai_link byt_max98090_dais[] = {