aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-29 14:36:17 +0000
committerAndreas Blaesius <skate4life@gmx.de>2016-04-30 11:03:44 +0200
commitb586517d4f7b4844a53e88e05e3005c7c772a065 (patch)
tree5c9121731fac486d8b18dd064dc5aa0f4c1e1ea9 /sound
parent6138417349c9b12dcb7df16561d46ee438eada02 (diff)
downloadkernel_samsung_espresso10-b586517d4f7b4844a53e88e05e3005c7c772a065.zip
kernel_samsung_espresso10-b586517d4f7b4844a53e88e05e3005c7c772a065.tar.gz
kernel_samsung_espresso10-b586517d4f7b4844a53e88e05e3005c7c772a065.tar.bz2
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>
Diffstat (limited to 'sound')
-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 310e3bf..109ed19 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2983,6 +2983,8 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
cb_data = codec;
}
+ snd_soc_dapm_force_enable_pin(&codec->dapm, "CLK_SYS");
+
wm8994->micdet[0].jack = jack;
wm8994->jack_cb = cb;
wm8994->jack_cb_data = cb_data;
@@ -2992,6 +2994,7 @@ int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack,
} else {
snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,
WM8958_MICD_ENA, 0);
+ snd_soc_dapm_disable_pin(&codec->dapm, "CLK_SYS");
}
return 0;