Commit b4046d01 authored by Mark Brown's avatar Mark Brown

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: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 601787c2
...@@ -3695,9 +3695,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) ...@@ -3695,9 +3695,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
if (wm8994->pdata && wm8994->pdata->micdet_irq) if (wm8994->pdata && wm8994->pdata->micdet_irq)
wm8994->micdet_irq = 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_enable(codec->dev);
pm_runtime_idle(codec->dev); pm_runtime_idle(codec->dev);
...@@ -3836,6 +3833,10 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) ...@@ -3836,6 +3833,10 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
dev_warn(codec->dev, dev_warn(codec->dev,
"Failed to request Mic detect IRQ: %d\n", "Failed to request Mic detect IRQ: %d\n",
ret); ret);
} else {
wm8994_request_irq(wm8994->wm8994, WM8994_IRQ_MIC1_DET,
wm8958_mic_irq, "Mic detect",
wm8994);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment