ASoC: amd: 16bit resolution support for i2s sp instance

Moved 16bit resolution condition check for stoney platform
to acp_hw_params.Depending upon substream required register
value need to be programmed rather than enabling 16bit resolution
support all time in acp init.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 11 insertions, 7 deletions

diff --git a/sound/soc/amd/acp-pcm-dma.c b/sound/soc/amd/acp-pcm-dma.c
index c33a512283a4..9fb356db3ab2 100644
--- a/sound/soc/amd/acp-pcm-dma.c
+++ b/sound/soc/amd/acp-pcm-dma.c
@@ -579,13 +579,6 @@ static int acp_init(void __iomem *acp_mmio, u32 asic_type)
                 for (bank = 1; bank < 48; bank++)
                         acp_set_sram_bank_state(acp_mmio, bank, false);
         }
-
-        /* Stoney supports 16bit resolution */
-        if (asic_type == CHIP_STONEY) {
-                val = acp_reg_read(acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
-                val |= 0x03;
-                acp_reg_write(val, acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
-        }
         return 0;
 }
 
@@ -774,6 +767,7 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream,
 {
         int status;
         uint64_t size;
+        u32 val = 0;
         struct page *pg;
         struct snd_pcm_runtime *runtime;
         struct audio_substream_data *rtd;
@@ -786,6 +780,14 @@ static int acp_dma_hw_params(struct snd_pcm_substream *substream,
         if (WARN_ON(!rtd))
                 return -EINVAL;
 
+        if (adata->asic_type == CHIP_STONEY) {
+                val = acp_reg_read(adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        val |= ACP_I2S_SP_16BIT_RESOLUTION_EN;
+                else
+                        val |= ACP_I2S_MIC_16BIT_RESOLUTION_EN;
+                acp_reg_write(val, adata->acp_mmio, mmACP_I2S_16BIT_RESOLUTION_EN);
+        }
         size = params_buffer_bytes(params);
         status = snd_pcm_lib_malloc_pages(substream, size);
         if (status < 0)
diff --git a/sound/soc/amd/acp.h b/sound/soc/amd/acp.h
index ecb458935d1e..9293f179f272 100644
--- a/sound/soc/amd/acp.h
+++ b/sound/soc/amd/acp.h
@@ -70,6 +70,8 @@
 #define CAPTURE_END_DMA_DESCR_CH15 7
 
 #define mmACP_I2S_16BIT_RESOLUTION_EN       0x5209
+#define ACP_I2S_MIC_16BIT_RESOLUTION_EN 0x01
+#define ACP_I2S_SP_16BIT_RESOLUTION_EN  0x02
 enum acp_dma_priority_level {
         /* 0x0 Specifies the DMA channel is given normal priority */
         ACP_DMA_PRIORITY_LEVEL_NORMAL = 0x0,