summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-01 16:00:15 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-01 18:56:33 +0000
commita5ef9884088de4ed87ee9490923f277e805b38b2 (patch)
treed3f4472fa7bd6742f8b4519647840d08e3ded836 /sound/soc/codecs
parentdb0e55438c39c5afa6b7674f5cef86b200bd89ba (diff)
downloadblackbird-op-linux-a5ef9884088de4ed87ee9490923f277e805b38b2.tar.gz
blackbird-op-linux-a5ef9884088de4ed87ee9490923f277e805b38b2.zip
ASoC: WM8962 accessory detection requires MICBIAS
Force MICBIAS on as well as SYSCLK as the WM8962 accessory detection can't function without both. No point in making machine drivers manually enable it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/wm8962.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 430bf535d546..b9c64a826ff6 100644
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3661,8 +3661,10 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
snd_soc_jack_report(wm8962->jack, 0,
SND_JACK_MICROPHONE | SND_JACK_BTN_0);
- if (jack)
+ if (jack) {
snd_soc_dapm_force_enable_pin(&codec->dapm, "SYSCLK");
+ snd_soc_dapm_force_enable_pin(&codec->dapm, "MICBIAS");
+ }
return 0;
}
OpenPOWER on IntegriCloud