ASoC: amd: add ACP3x TDM mode support

ACP3x I2S (CPU DAI) can act in normal I2S and TDM modes. Added support
for TDM mode. Desired mode can be selected from ASoC machine driver.

Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
Link: https://lore.kernel.org/r/1577540460-21438-4-git-send-email-Vishnuvardhanrao.Ravulapati@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 368e4c855268d800becd5b5b1c475002a9b415b8..d9b287b8396c2ef15d3febf6df4082212b9f048e 100644 (file)
--- a/sound/soc/amd/raven/acp3x-i2s.c
+++ b/sound/soc/amd/raven/acp3x-i2s.c
@@ -42,7 +42,7 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai,
                u32 tx_mask, u32 rx_mask, int slots, int slot_width)
 {
        struct i2s_dev_data *adata;
-       u32 val, reg_val, frmt_val, frm_len;
+       u32 val, reg_val, frmt_reg, frm_len;
        u16 slot_len;
 
        adata = snd_soc_dai_get_drvdata(cpu_dai);
@@ -69,15 +69,31 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai,
 
        frm_len = FRM_LEN | (slots << 15) | (slot_len << 18);
        if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) {
-               reg_val = mmACP_BTTDM_ITER;
-               frmt_val = mmACP_BTTDM_TXFRMT;
+               switch (adata->i2s_instance) {
+               case I2S_BT_INSTANCE:
+                       reg_val = mmACP_BTTDM_ITER;
+                       frmt_reg = mmACP_BTTDM_TXFRMT;
+                       break;
+               case I2S_SP_INSTANCE:
+               default:
+                       reg_val = mmACP_I2STDM_ITER;
+                       frmt_reg = mmACP_I2STDM_TXFRMT;
+               }
        } else {
-               reg_val = mmACP_BTTDM_IRER;
-               frmt_val = mmACP_BTTDM_RXFRMT;
+               switch (adata->i2s_instance) {
+               case I2S_BT_INSTANCE:
+                       reg_val = mmACP_BTTDM_IRER;
+                       frmt_reg = mmACP_BTTDM_RXFRMT;
+                       break;
+               case I2S_SP_INSTANCE:
+               default:
+                       reg_val = mmACP_I2STDM_IRER;
+                       frmt_reg = mmACP_I2STDM_RXFRMT;
+               }
        }
        val = rv_readl(adata->acp3x_base + reg_val);
        rv_writel(val | 0x2, adata->acp3x_base + reg_val);
-       rv_writel(frm_len, adata->acp3x_base + frmt_val);
+       rv_writel(frm_len, adata->acp3x_base + frmt_reg);
        adata->tdm_fmt = frm_len;
        return 0;
 }

diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h
index a1cdc4e768e226ee0bb1f4bf68702b4d9041da26..43213aec7f59f79ea43b78a764dcd30dfc8807b1 100644 (file)
--- a/sound/soc/amd/raven/acp3x.h
+++ b/sound/soc/amd/raven/acp3x.h
@@ -78,6 +78,7 @@ struct acp3x_platform_info {
 struct i2s_dev_data {
        bool tdm_mode;
        unsigned int i2s_irq;
+       u16 i2s_instance;
        u32 tdm_fmt;
        u32 substream_type;
        void __iomem *acp3x_base;