ASoC: amd: Fix simultaneous playback and capture

Stopping of one stream is killing the other stream when they
are running simultaneously. This is because, IER register is
cleared which disables I2S and overrides any other block enables.

Clearing IER register only when all streams on a channel are disabled,
fixes the issue.

Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
Link: https://lore.kernel.org/r/20200128103029.128841-1-akshu.agrawal@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c
index bf51cadf86821b8f25f7dcae16910e07dccc504f..31cd4008e33ff88d9b61085133d12755a60f1724 100644 (file)
--- a/sound/soc/amd/raven/acp3x-i2s.c
+++ b/sound/soc/amd/raven/acp3x-i2s.c
@@ -234,30 +234,32 @@ static int acp3x_i2s_trigger(struct snd_pcm_substream *substream,
                        switch (rtd->i2s_instance) {
                        case I2S_BT_INSTANCE:
                                reg_val = mmACP_BTTDM_ITER;
-                               ier_val = mmACP_BTTDM_IER;
                                break;
                        case I2S_SP_INSTANCE:
                        default:
                                reg_val = mmACP_I2STDM_ITER;
-                               ier_val = mmACP_I2STDM_IER;
                        }
 
                } else {
                        switch (rtd->i2s_instance) {
                        case I2S_BT_INSTANCE:
                                reg_val = mmACP_BTTDM_IRER;
-                               ier_val = mmACP_BTTDM_IER;
                                break;
                        case I2S_SP_INSTANCE:
                        default:
                                reg_val = mmACP_I2STDM_IRER;
-                               ier_val = mmACP_I2STDM_IER;
                        }
                }
                val = rv_readl(rtd->acp3x_base + reg_val);
                val = val & ~BIT(0);
                rv_writel(val, rtd->acp3x_base + reg_val);
-               rv_writel(0, rtd->acp3x_base + ier_val);
+
+               if (!(rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER) & BIT(0)) &&
+                    !(rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER) & BIT(0)))
+                       rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER);
+               if (!(rv_readl(rtd->acp3x_base + mmACP_I2STDM_ITER) & BIT(0)) &&
+                    !(rv_readl(rtd->acp3x_base + mmACP_I2STDM_IRER) & BIT(0)))
+                       rv_writel(0, rtd->acp3x_base + mmACP_I2STDM_IER);
                ret = 0;
                break;
        default: