aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-01 19:01:43 +0000
committerAndreas Blaesius <skate4life@gmx.de>2016-04-30 11:03:52 +0200
commitb7565e974f268f3f4a7d9db424291cdfde948979 (patch)
tree8c3b7fc1f6a7c3993c8eb1828dec0cd0c0282503 /sound
parentabb9a40e01dcce61d998f51300e945b1ed15a4ef (diff)
downloadkernel_samsung_espresso10-b7565e974f268f3f4a7d9db424291cdfde948979.zip
kernel_samsung_espresso10-b7565e974f268f3f4a7d9db424291cdfde948979.tar.gz
kernel_samsung_espresso10-b7565e974f268f3f4a7d9db424291cdfde948979.tar.bz2
ASoC: wm8994: Disable debounce of jack detection on inserted jack
Don't debounce jack detection for inserted jacks, giving improved responsiveness. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index e806b9a..4aeb135 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3257,6 +3257,10 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
snd_soc_update_bits(codec, WM8958_MICBIAS2,
WM8958_MICB2_DISCH, 0);
+ /* Disable debounce while inserted */
+ snd_soc_update_bits(codec, WM1811_JACKDET_CTRL,
+ WM1811_JACKDET_DB, 0);
+
/*
* Start off measument of microphone impedence to find
* out what's actually there.
@@ -3292,6 +3296,10 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
SND_JACK_MECHANICAL | SND_JACK_HEADSET |
wm8994->btn_mask);
+ /* Enable debounce while removed */
+ snd_soc_update_bits(codec, WM1811_JACKDET_CTRL,
+ WM1811_JACKDET_DB, WM1811_JACKDET_DB);
+
wm8994->mic_detecting = false;
wm8994->jack_mic = false;
snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,