leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: wm8994: Demux the microphone detection IRQ

Browse Source 
Current code only allows direct routing of the WM8994 microphone
detection signal to a GPIO this change adds support to demux the
interrupt from the main interrupt line of the codec.

Signed-off-by: Nikesh Oswal <nikesh@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Nikesh Oswal 2014-08-13 10:05:45 +01:00 committed by Mark Brown
parent 7d1311b93e
commit dfe8f1f3f2
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/codecs/wm8994.c
View File

@ -4082,17 +4082,23 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
switch (control->type) { switch (control->type) {
case WM8994: case WM8994:
if (wm8994->micdet_irq) { if (wm8994->micdet_irq)
ret = request_threaded_irq(wm8994->micdet_irq, NULL, ret = request_threaded_irq(wm8994->micdet_irq, NULL,
wm8994_mic_irq, wm8994_mic_irq,
IRQF_TRIGGER_RISING, IRQF_TRIGGER_RISING,
"Mic1 detect", "Mic1 detect",
wm8994); wm8994);
if (ret != 0) else
dev_warn(codec->dev, ret = wm8994_request_irq(wm8994->wm8994,
"Failed to request Mic1 detect IRQ: %d\n", WM8994_IRQ_MIC1_DET,
ret); wm8994_mic_irq, "Mic 1 detect",
} wm8994);
if (ret != 0)
dev_warn(codec->dev,
"Failed to request Mic1 detect IRQ: %d\n",
ret);
ret = wm8994_request_irq(wm8994->wm8994, ret = wm8994_request_irq(wm8994->wm8994,
WM8994_IRQ_MIC1_SHRT, WM8994_IRQ_MIC1_SHRT,