ASoC: AMD: Clear format bits before setting them

This avoids residual bit form previous format when the format is changed.
Hence, the resultant format is not an invalid one.

Signed-off-by: Akshu Agrawal <akshu.agrawal@amd.com>
Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
Link: https://lore.kernel.org/r/20200328093921.32211-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 3a3c47e820ab9ba0e29821aa1e580ec0fb4b94c8..f160d35a6832916083aa1000a519248fbd4e808c 100644 (file)
--- a/sound/soc/amd/raven/acp3x-i2s.c
+++ b/sound/soc/amd/raven/acp3x-i2s.c
@@ -139,6 +139,7 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream,
                rv_writel(adata->tdm_fmt, rtd->acp3x_base + frmt_reg);
        }
        val = rv_readl(rtd->acp3x_base + reg_val);
+       val &= ~ACP3x_ITER_IRER_SAMP_LEN_MASK;
        val = val | (rtd->xfer_resolution  << 3);
        rv_writel(val, rtd->acp3x_base + reg_val);
        return 0;

diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h
index 21e7ac017f2bd1a75679f30253b8c68f52bcf546..03fe93913e12e39ce506d5218e2ec06c4f481734 100644 (file)
--- a/sound/soc/amd/raven/acp3x.h
+++ b/sound/soc/amd/raven/acp3x.h
@@ -76,6 +76,8 @@
 #define ACP_POWERED_OFF                        0x02
 #define ACP_POWER_OFF_IN_PROGRESS      0x03
 
+#define ACP3x_ITER_IRER_SAMP_LEN_MASK  0x38
+
 struct acp3x_platform_info {
        u16 play_i2s_instance;
        u16 cap_i2s_instance;