ASoC: SOF: amd: update descriptor fields for acp6.3 based platform

Update acp descriptor fields for acp6.3 version based platform.

Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://msgid.link/r/20240129055147.1493853-12-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/amd/acp-dsp-offset.h b/sound/soc/sof/amd/acp-dsp-offset.h
index 7ba6492b8e99bab6248a39992176baa088523b90..c1bdc028a61a42b36b2b327bec241ffa8e7d17bd 100644 (file)
--- a/sound/soc/sof/amd/acp-dsp-offset.h
+++ b/sound/soc/sof/amd/acp-dsp-offset.h
@@ -65,7 +65,10 @@
 /* Registers from ACP_INTR block */
 #define ACP3X_EXT_INTR_STAT                    0x1808
 #define ACP5X_EXT_INTR_STAT                    0x1808
+#define ACP6X_EXTERNAL_INTR_ENB                        0x1A00
+#define ACP6X_EXTERNAL_INTR_CNTL               0x1A04
 #define ACP6X_EXT_INTR_STAT                     0x1A0C
+#define ACP6X_EXT_INTR_STAT1                   0x1A10
 
 #define ACP3X_DSP_SW_INTR_BASE                 0x1814
 #define ACP5X_DSP_SW_INTR_BASE                 0x1814

diff --git a/sound/soc/sof/amd/acp.h b/sound/soc/sof/amd/acp.h
index 2058dae32659b3aedb75f14ae198768cc8f538f1..e94713d7ff1d9f50551948383d839b23c3bbf9dd 100644 (file)
--- a/sound/soc/sof/amd/acp.h
+++ b/sound/soc/sof/amd/acp.h
@@ -96,8 +96,10 @@
 #define ACP_ERROR_IRQ_MASK                     BIT(29)
 #define ACP_SDW0_IRQ_MASK                      BIT(21)
 #define ACP_SDW1_IRQ_MASK                      BIT(2)
+#define SDW_ACPI_ADDR_ACP63                    5
 #define ACP_DEFAULT_SRAM_LENGTH                        0x00080000
 #define ACP_SRAM_PAGE_COUNT                    128
+#define ACP6X_SDW_MAX_MANAGER_COUNT            2
 
 enum clock_source {
        ACP_CLOCK_96M = 0,

diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c
index bceb94ac80a9d0a6a1c2e38255c39e58cf7c3344..eeaa12cceb23311312d5104ae4452c0e745fb22a 100644 (file)
--- a/sound/soc/sof/amd/pci-acp63.c
+++ b/sound/soc/sof/amd/pci-acp63.c
@@ -31,12 +31,19 @@ static const struct sof_amd_acp_desc acp63_chip_info = {
        .rev            = 6,
        .host_bridge_id = HOST_BRIDGE_ACP63,
        .pgfsm_base     = ACP6X_PGFSM_BASE,
+       .ext_intr_enb = ACP6X_EXTERNAL_INTR_ENB,
+       .ext_intr_cntl = ACP6X_EXTERNAL_INTR_CNTL,
        .ext_intr_stat  = ACP6X_EXT_INTR_STAT,
+       .ext_intr_stat1 = ACP6X_EXT_INTR_STAT1,
        .dsp_intr_base  = ACP6X_DSP_SW_INTR_BASE,
        .sram_pte_offset = ACP6X_SRAM_PTE_OFFSET,
        .hw_semaphore_offset = ACP6X_AXI2DAGB_SEM_0,
        .fusion_dsp_offset = ACP6X_DSP_FUSION_RUNSTALL,
        .probe_reg_offset = ACP6X_FUTURE_REG_ACLK_0,
+       .sdw_max_link_count = ACP6X_SDW_MAX_MANAGER_COUNT,
+       .sdw_acpi_dev_addr = SDW_ACPI_ADDR_ACP63,
+       .reg_start_addr = ACP6x_REG_START,
+       .reg_end_addr = ACP6x_REG_END,
 };
 
 static const struct sof_dev_desc acp63_desc = {