ASoC: amd: acp: store acp pci rev id in platform driver private structure

Store acp pci revision id in platform driver private structure for all
acp varaints.

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

diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c
index af6005888c82924566502a77247c1e9a1357c37f..065ac13b22208d2ac0815638be7e442a73aa4fee 100644 (file)
--- a/sound/soc/amd/acp/acp-rembrandt.c
+++ b/sound/soc/amd/acp/acp-rembrandt.c
@@ -228,6 +228,7 @@ static int rembrandt_audio_probe(struct platform_device *pdev)
        adata->num_dai = ARRAY_SIZE(acp_rmb_dai);
        adata->rsrc = &rsrc;
        adata->platform = REMBRANDT;
+       adata->acp_rev = chip->acp_rev;
        adata->flag = chip->flag;
        adata->is_i2s_config = chip->is_i2s_config;
        adata->machines = snd_soc_acpi_amd_rmb_acp_machines;

diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c
index 65782023435eeff9cd98324d7333495faaaa21a2..f372a56a0a17a91a82ee910fc438cce44b3b2f89 100644 (file)
--- a/sound/soc/amd/acp/acp-renoir.c
+++ b/sound/soc/amd/acp/acp-renoir.c
@@ -186,6 +186,7 @@ static int renoir_audio_probe(struct platform_device *pdev)
        adata->num_dai = ARRAY_SIZE(acp_renoir_dai);
        adata->rsrc = &rsrc;
        adata->platform = RENOIR;
+       adata->acp_rev = chip->acp_rev;
        adata->flag = chip->flag;
 
        adata->machines = snd_soc_acpi_amd_acp_machines;

diff --git a/sound/soc/amd/acp/acp63.c b/sound/soc/amd/acp/acp63.c
index 099e2df5558d016fc75456d1db9b79d6eda23feb..f0c516ccf96b33cf9046069166b3c957f57d8dee 100644 (file)
--- a/sound/soc/amd/acp/acp63.c
+++ b/sound/soc/amd/acp/acp63.c
@@ -238,6 +238,7 @@ static int acp63_audio_probe(struct platform_device *pdev)
        adata->num_dai = ARRAY_SIZE(acp63_dai);
        adata->rsrc = &rsrc;
        adata->platform = ACP63;
+       adata->acp_rev = chip->acp_rev;
        adata->flag = chip->flag;
        adata->is_i2s_config = chip->is_i2s_config;
        adata->machines = snd_soc_acpi_amd_acp63_acp_machines;

diff --git a/sound/soc/amd/acp/acp70.c b/sound/soc/amd/acp/acp70.c
index 0cd3daf677f56a4a2957ac05a20b77f6e8fc65e9..82c26e4fefc18121a77820cf30ba2ca3b6b27f01 100644 (file)
--- a/sound/soc/amd/acp/acp70.c
+++ b/sound/soc/amd/acp/acp70.c
@@ -209,6 +209,7 @@ static int acp_acp70_audio_probe(struct platform_device *pdev)
        adata->num_dai = ARRAY_SIZE(acp70_dai);
        adata->rsrc = &rsrc;
        adata->machines = snd_soc_acpi_amd_acp70_acp_machines;
+       adata->acp_rev = chip->acp_rev;
        if (chip->acp_rev == ACP70_PCI_ID)
                adata->platform = ACP70;
        else

diff --git a/sound/soc/amd/acp/amd.h b/sound/soc/amd/acp/amd.h
index c82e438a1712d897caa870a937b1c6624c201dec..dcfc29b2f0722fb4a69e4398fc6509bc3824eb90 100644 (file)
--- a/sound/soc/amd/acp/amd.h
+++ b/sound/soc/amd/acp/amd.h
@@ -177,6 +177,7 @@ struct acp_dev_data {
        struct device *dev;
        void __iomem *acp_base;
        unsigned int i2s_irq;
+       unsigned int acp_rev;   /* ACP Revision id */
 
        bool tdm_mode;
        bool is_i2s_config;