aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-29 09:36:17 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-29 12:23:29 -0500
commit4cdf5e49ce8ff79038ee5388cc5f97097238bb29 (patch)
tree8bd141dc5e88194d4a9fd5c685f79625d1ce818b
parent38fd54ee38624a52c28d65fadfd452c9c49fb152 (diff)
ASoC: Ensure SYSCLK is enabled for WM8958 accessory detection
Ensure SYSCLK is enabled while running accessory detection on WM8958. It is always required so there is no sense in requiring machine drivers to individually do this. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm8994.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 5ea0c3c15254..0a16de743dd8 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3016,6 +3016,8 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
3016 cb_data = codec; 3016 cb_data = codec;
3017 } 3017 }
3018 3018
3019 snd_soc_dapm_force_enable_pin(&codec->dapm, "CLK_SYS");
3020
3019 wm8994->micdet[0].jack = jack; 3021 wm8994->micdet[0].jack = jack;
3020 wm8994->jack_cb = cb; 3022 wm8994->jack_cb = cb;
3021 wm8994->jack_cb_data = cb_data; 3023 wm8994->jack_cb_data = cb_data;
@@ -3025,6 +3027,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
3025 } else { 3027 } else {
3026 snd_soc_update_bits(codec, WM8958_MIC_DETECT_1, 3028 snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,
3027 WM8958_MICD_ENA, 0); 3029 WM8958_MICD_ENA, 0);
3030 snd_soc_dapm_disable_pin(&codec->dapm, "CLK_SYS");
3028 } 3031 }
3029 3032
3030 return 0; 3033 return 0;