ASoC: amd: acp: rembrandt: Use AMD_NODE

All consumers of SMN in the kernel should be doing it through the
functions provided by AMD_NODE.

Stop using the local SMN read/write symbols and switch to the AMD_NODE
provided ones.

Tested by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Link: https://patch.msgid.link/20250217231747.1656228-3-superm1@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/Kconfig b/sound/soc/amd/acp/Kconfig
index 03f3fcbba5af15930acb55ee73b07722f1ee78a8..cdc3add3ffdb080a19c0c5ca583241c30c49e1ad 100644 (file)
--- a/sound/soc/amd/acp/Kconfig
+++ b/sound/soc/amd/acp/Kconfig
@@ -58,6 +58,7 @@ config SND_AMD_ASOC_REMBRANDT
        select SND_SOC_AMD_ACP_I2S
        select SND_SOC_AMD_ACP_PDM
        select SND_SOC_AMD_ACP_LEGACY_COMMON
+       depends on AMD_NODE
        depends on X86 && PCI
        help
          This option enables Rembrandt I2S support on AMD platform.

diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c
index 2648256fa129ceebe4eec5b9fcf7c46d2d82a9bc..e727754a8231c89b113621bac134037c2129817a 100644 (file)
--- a/sound/soc/amd/acp/acp-rembrandt.c
+++ b/sound/soc/amd/acp/acp-rembrandt.c
@@ -22,6 +22,8 @@
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
 
+#include <asm/amd_node.h>
+
 #include "amd.h"
 #include "../mach-config.h"
 #include "acp-mach.h"
@@ -31,7 +33,6 @@
 #define MP1_C2PMSG_69 0x3B10A14
 #define MP1_C2PMSG_85 0x3B10A54
 #define MP1_C2PMSG_93 0x3B10A74
-#define HOST_BRIDGE_ID 0x14B5
 
 static struct acp_resource rsrc = {
        .offset = 0,
@@ -166,21 +167,20 @@ static struct snd_soc_dai_driver acp_rmb_dai[] = {
 
 static int acp6x_master_clock_generate(struct device *dev)
 {
-       int data = 0;
-       struct pci_dev *smn_dev;
+       int data, rc;
 
-       smn_dev = pci_get_device(PCI_VENDOR_ID_AMD, HOST_BRIDGE_ID, NULL);
-       if (!smn_dev) {
-               dev_err(dev, "Failed to get host bridge device\n");
-               return -ENODEV;
-       }
+       rc = amd_smn_write(0, MP1_C2PMSG_93, 0);
+       if (rc)
+               return rc;
+       rc = amd_smn_write(0, MP1_C2PMSG_85, 0xC4);
+       if (rc)
+               return rc;
+       rc = amd_smn_write(0, MP1_C2PMSG_69, 0x4);
+       if (rc)
+               return rc;
 
-       smn_write(smn_dev, MP1_C2PMSG_93, 0);
-       smn_write(smn_dev, MP1_C2PMSG_85, 0xC4);
-       smn_write(smn_dev, MP1_C2PMSG_69, 0x4);
-       read_poll_timeout(smn_read, data, data, DELAY_US,
-                         ACP_TIMEOUT, false, smn_dev, MP1_C2PMSG_93);
-       return 0;
+       return read_poll_timeout(smn_read_register, data, data > 0, DELAY_US,
+                                ACP_TIMEOUT, false, MP1_C2PMSG_93);
 }
 
 static int rembrandt_audio_probe(struct platform_device *pdev)