diff options
| author | Mark Brown <broonie@kernel.org> | 2018-08-09 16:46:56 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-08-09 16:46:56 +0300 |
| commit | 6c084839877666d987ff8bc4e0facd3c02d99d61 (patch) | |
| tree | 714675fae123ffbe42dd04892be2561ac34d1d8d /sound/soc/codecs/wm5102.c | |
| parent | 1ffaddd029c867d134a1dde39f540dcc8c52e274 (diff) | |
| parent | 0717edbdfed61b4c1e8291140f78882d3a481042 (diff) | |
| download | linux-6c084839877666d987ff8bc4e0facd3c02d99d61.tar.xz | |
Merge branch 'asoc-4.18' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/wm5102.c')
| -rw-r--r-- | sound/soc/codecs/wm5102.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 1ac83388d1b8..a01a0c0e01eb 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -2094,6 +2094,12 @@ static int wm5102_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); @@ -2117,6 +2123,7 @@ static int wm5102_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, wm5102); return ret; @@ -2133,6 +2140,7 @@ static int wm5102_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, wm5102); return 0; |