diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-18 14:11:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-18 17:09:23 -0400 |
commit | b4046d013b5b9a7cab835def403f7f421cdf0cb6 (patch) | |
tree | db3d4d1ad69845694d22b31459a9a55f10ff0c82 /sound/soc/codecs/wm8994.c | |
parent | 601787c232306e0bb84fff9fc7c2be5a5c7b87a0 (diff) |
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>
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
-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 7bb875230dc0..65763388649c 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) | |||
3695 | 3695 | ||
3696 | if (wm8994->pdata && wm8994->pdata->micdet_irq) | 3696 | if (wm8994->pdata && wm8994->pdata->micdet_irq) |
3697 | wm8994->micdet_irq = wm8994->pdata->micdet_irq; | 3697 | wm8994->micdet_irq = wm8994->pdata->micdet_irq; |
3698 | else if (wm8994->pdata && wm8994->pdata->irq_base) | ||
3699 | wm8994->micdet_irq = wm8994->pdata->irq_base + | ||
3700 | WM8994_IRQ_MIC1_DET; | ||
3701 | 3698 | ||
3702 | pm_runtime_enable(codec->dev); | 3699 | pm_runtime_enable(codec->dev); |
3703 | pm_runtime_idle(codec->dev); | 3700 | pm_runtime_idle(codec->dev); |
@@ -3836,6 +3833,10 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) | |||
3836 | dev_warn(codec->dev, | 3833 | dev_warn(codec->dev, |
3837 | "Failed to request Mic detect IRQ: %d\n", | 3834 | "Failed to request Mic detect IRQ: %d\n", |
3838 | ret); | 3835 | ret); |
3836 | } else { | ||
3837 | wm8994_request_irq(wm8994->wm8994, WM8994_IRQ_MIC1_DET, | ||
3838 | wm8958_mic_irq, "Mic detect", | ||
3839 | wm8994); | ||
3839 | } | 3840 | } |
3840 | } | 3841 | } |
3841 | 3842 | ||