]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: fsl_spdif: Fix unexpected interrupt after suspend
authorShengjiu Wang <shengjiu.wang@nxp.com>
Tue, 22 Jun 2021 12:31:24 +0000 (20:31 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 15:00:25 +0000 (17:00 +0200)
[ Upstream commit a7a0a2feb957e446b2bcf732f245ba04fc8b6314 ]

When system enter suspend, the machine driver suspend callback
function will be called, then the cpu driver trigger callback
(SNDRV_PCM_TRIGGER_SUSPEND) be called, it would disable the
interrupt.

But the machine driver suspend and cpu dai driver suspend order
maybe changed, the cpu dai driver's suspend callback is called before
machine driver's suppend callback, then the interrupt is not cleared
successfully in trigger callback.

So need to clear interrupts in cpu dai driver's suspend callback
to avoid such issue.

Fixes: 9cb2b3796e08 ("ASoC: fsl_spdif: Add pm runtime function")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/1624365084-7934-1-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/fsl/fsl_spdif.c

index e5d366b2a6a461d7905251f59c333440abe27934..6d5e9c0acdb4fdb2d8aec8741a1e5e154052a853 100644 (file)
@@ -1429,6 +1429,9 @@ static int fsl_spdif_runtime_suspend(struct device *dev)
        struct fsl_spdif_priv *spdif_priv = dev_get_drvdata(dev);
        int i;
 
+       /* Disable all the interrupts */
+       regmap_update_bits(spdif_priv->regmap, REG_SPDIF_SIE, 0xffffff, 0);
+
        regmap_read(spdif_priv->regmap, REG_SPDIF_SRPC,
                        &spdif_priv->regcache_srpc);
        regcache_cache_only(spdif_priv->regmap, true);