aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8994.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-01 14:01:43 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-01 14:06:37 -0500
commit378ec0ca38527d3ca3683f7f38f3243c8d0a90f3 (patch)
tree513b3e99ac17260ce7386f00e47086d63c56dcf3 /sound/soc/codecs/wm8994.c
parentdf0c016d0bbeea99f93b5f7836d6418a19feefa7 (diff)
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/soc/codecs/wm8994.c')
-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 bc1f1199a87f..81d62a38475e 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3235,6 +3235,10 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
3235 snd_soc_update_bits(codec, WM8958_MICBIAS2, 3235 snd_soc_update_bits(codec, WM8958_MICBIAS2,
3236 WM8958_MICB2_DISCH, 0); 3236 WM8958_MICB2_DISCH, 0);
3237 3237
3238 /* Disable debounce while inserted */
3239 snd_soc_update_bits(codec, WM1811_JACKDET_CTRL,
3240 WM1811_JACKDET_DB, 0);
3241
3238 /* 3242 /*
3239 * Start off measument of microphone impedence to find 3243 * Start off measument of microphone impedence to find
3240 * out what's actually there. 3244 * out what's actually there.
@@ -3270,6 +3274,10 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data)
3270 SND_JACK_MECHANICAL | SND_JACK_HEADSET | 3274 SND_JACK_MECHANICAL | SND_JACK_HEADSET |
3271 wm8994->btn_mask); 3275 wm8994->btn_mask);
3272 3276
3277 /* Enable debounce while removed */
3278 snd_soc_update_bits(codec, WM1811_JACKDET_CTRL,
3279 WM1811_JACKDET_DB, WM1811_JACKDET_DB);
3280
3273 wm8994->mic_detecting = false; 3281 wm8994->mic_detecting = false;
3274 wm8994->jack_mic = false; 3282 wm8994->jack_mic = false;
3275 snd_soc_update_bits(codec, WM8958_MIC_DETECT_1, 3283 snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,