diff options
| author |   Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2014-06-23 16:29:42 +0300 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2014-06-24 16:20:43 +0100 |
| commit | ab6f7d0d932313cedfb1696e0536bdbe661cd9c9 (patch) | |
| tree | 643a1a2f611cb84cac2f874c6e57f662d4706fa3 /sound/soc/intel/byt-max98090.c | |
| parent | ASoC: Intel: byt-max98090: Fix jack type in order to report correctly (diff) | |
| download | linux-dev-ab6f7d0d932313cedfb1696e0536bdbe661cd9c9.tar.xz linux-dev-ab6f7d0d932313cedfb1696e0536bdbe661cd9c9.zip | |
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>
Diffstat (limited to 'sound/soc/intel/byt-max98090.c')
| -rw-r--r-- | sound/soc/intel/byt-max98090.c | 10 |
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) if (ret) return ret; - ret = snd_soc_jack_add_gpiods(card->dev->parent, jack, - ARRAY_SIZE(hs_jack_gpios), - hs_jack_gpios); - if (ret) - return ret; - - return max98090_mic_detect(codec, jack); + return snd_soc_jack_add_gpiods(card->dev->parent, jack, + ARRAY_SIZE(hs_jack_gpios), + hs_jack_gpios); } static struct snd_soc_dai_link byt_max98090_dais[] = { |