summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/cs47l24.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-08-09 16:46:56 +0300
committerMark Brown <broonie@kernel.org>2018-08-09 16:46:56 +0300
commit6c084839877666d987ff8bc4e0facd3c02d99d61 (patch)
tree714675fae123ffbe42dd04892be2561ac34d1d8d /sound/soc/codecs/cs47l24.c
parent1ffaddd029c867d134a1dde39f540dcc8c52e274 (diff)
parent0717edbdfed61b4c1e8291140f78882d3a481042 (diff)
downloadlinux-6c084839877666d987ff8bc4e0facd3c02d99d61.tar.xz
Merge branch 'asoc-4.18' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/cs47l24.c')
-rw-r--r--sound/soc/codecs/cs47l24.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c
index 196e9c343aeb..0da52ead91e0 100644
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@ -1283,6 +1283,12 @@ static int cs47l24_probe(struct platform_device *pdev)
return ret;
}
+ ret = arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 1);
+ if (ret != 0)
+ dev_warn(&pdev->dev,
+ "Failed to set compressed IRQ as a wake source: %d\n",
+ ret);
+
arizona_init_common(arizona);
ret = arizona_init_vol_limit(arizona);
@@ -1306,6 +1312,7 @@ static int cs47l24_probe(struct platform_device *pdev)
err_spk_irqs:
arizona_free_spk_irqs(arizona);
err_dsp_irq:
+ arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);
return ret;
@@ -1323,6 +1330,7 @@ static int cs47l24_remove(struct platform_device *pdev)
arizona_free_spk_irqs(arizona);
+ arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, cs47l24);
return 0;