ASoC: Intel: byt-max98090: Do not enable MAX98090 microphone detection
authorJarkko Nikula <jarkko.nikula@linux.intel.com>
Mon, 23 Jun 2014 13:29:42 +0000 (16:29 +0300)
committerMark Brown <broonie@linaro.org>
Tue, 24 Jun 2014 15:20:43 +0000 (16:20 +0100)
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>
sound/soc/intel/byt-max98090.c

index 3e2e7152ae666cf4950be0f421930b55c0666fa1..5cfb41ec3fab4bdba1e49022bfa94dae2c98d975 100644 (file)
@@ -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[] = {