ASoC: amd: acp: replace adata->platform conditional check

Replace adata->platform condition check with acp pci revision id
variable in config_acp_dma() & acp70_i2s_master_clock_generate()
functions.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://patch.msgid.link/20240924061821.1127054-9-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/acp-platform.c b/sound/soc/amd/acp/acp-platform.c
index 78fcff6ea65785c84d4425ac7cc0296575b5c36c..7be9b4ff79232daff271b97a09de0eaa61e48268 100644 (file)
--- a/sound/soc/amd/acp/acp-platform.c
+++ b/sound/soc/amd/acp/acp-platform.c
@@ -205,9 +205,9 @@ void config_acp_dma(struct acp_dev_data *adata, struct acp_stream *stream, int s
        u32 low, high, val;
        u16 page_idx;
 
-       switch (adata->platform) {
-       case ACP70:
-       case ACP71:
+       switch (adata->acp_rev) {
+       case ACP70_PCI_ID:
+       case ACP71_PCI_ID:
                switch (stream->dai_id) {
                case I2S_SP_INSTANCE:
                        if (stream->dir == SNDRV_PCM_STREAM_PLAYBACK)

diff --git a/sound/soc/amd/acp/acp70.c b/sound/soc/amd/acp/acp70.c
index 82c26e4fefc18121a77820cf30ba2ca3b6b27f01..db5dd64969b0f53a038205a8c187aeb628d2b212 100644 (file)
--- a/sound/soc/amd/acp/acp70.c
+++ b/sound/soc/amd/acp/acp70.c
@@ -142,9 +142,9 @@ static int acp70_i2s_master_clock_generate(struct acp_dev_data *adata)
        struct pci_dev *smn_dev;
        u32 device_id;
 
-       if (adata->platform == ACP70)
+       if (adata->acp_rev == ACP70_PCI_ID)
                device_id = 0x1507;
-       else if (adata->platform == ACP71)
+       else if (adata->acp_rev == ACP71_PCI_ID)
                device_id = 0x1122;
        else
                return -ENODEV;