diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-18 19:11:30 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-18 22:09:23 +0100 |
| commit | b4046d013b5b9a7cab835def403f7f421cdf0cb6 (patch) | |
| tree | db3d4d1ad69845694d22b31459a9a55f10ff0c82 | |
| parent | 601787c232306e0bb84fff9fc7c2be5a5c7b87a0 (diff) | |
| download | linux-3.10-b4046d013b5b9a7cab835def403f7f421cdf0cb6.tar.gz linux-3.10-b4046d013b5b9a7cab835def403f7f421cdf0cb6.tar.bz2 linux-3.10-b4046d013b5b9a7cab835def403f7f421cdf0cb6.zip | |
ASoC: wm8994: Update micdet for irqdomain conversion
The conversion of the core driver to irqdomains means that we don't need
and irq_base to have working interrupts so use wm8994_request_irq() to
deal with looking up the interrupt number for the micdet IRQ.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 7bb875230dc..65763388649 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3695,9 +3695,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) if (wm8994->pdata && wm8994->pdata->micdet_irq) wm8994->micdet_irq = wm8994->pdata->micdet_irq; - else if (wm8994->pdata && wm8994->pdata->irq_base) - wm8994->micdet_irq = wm8994->pdata->irq_base + - WM8994_IRQ_MIC1_DET; pm_runtime_enable(codec->dev); pm_runtime_idle(codec->dev); @@ -3836,6 +3833,10 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) dev_warn(codec->dev, "Failed to request Mic detect IRQ: %d\n", ret); + } else { + wm8994_request_irq(wm8994->wm8994, WM8994_IRQ_MIC1_DET, + wm8958_mic_irq, "Mic detect", + wm8994); } } |