[PATCH 8/11] ASoC: amd: acp: add ACP6x SoundWire quirks and machine support

[Corey Smith <corsmith@gmail.com>]

Teach the generic AMD SoundWire machine driver to handle ACP6x: reuse
the ACP6.3 CPU pin mapping and the amd_ps_sdw_dma/acp_ps_pdm_dma
platform components, and add a DMI quirk for the HP Dragonfly Pro ONE
(board 8A7F) enabling the RT1316 speaker amplifiers and the ACP DMIC.

Assisted-by: LLM
Signed-off-by: Corey Smith <corsmith@gmail.com>
---
 sound/soc/amd/acp/acp-sdw-legacy-mach.c | 20 ++++++++++++++++++++
 sound/soc/amd/acp/soc_amd_sdw_common.h  |  2 ++
 2 files changed, 22 insertions(+)

diff --git a/sound/soc/amd/acp/acp-sdw-legacy-mach.c b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
index 1a05d42..97bc5cd 100644
--- a/sound/soc/amd/acp/acp-sdw-legacy-mach.c
+++ b/sound/soc/amd/acp/acp-sdw-legacy-mach.c
@@ -135,6 +135,20 @@ static const struct dmi_system_id soc_sdw_quirk_table[] = {
 		},
 		.driver_data = (void *)(ASOC_SDW_ACP_DMIC),
 	},
+	{
+		/*
+		 * HP Dragonfly Pro ONE (board 8A7F, AMD Rembrandt / ACP6x):
+		 * two RT1316 SDCA speaker amplifiers exposed as an aggregated
+		 * "Speaker" endpoint on SoundWire link 0, together with the ACP
+		 * PDM DMIC.
+		 */
+		.callback = soc_sdw_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),
+			DMI_MATCH(DMI_BOARD_NAME, "8A7F"),
+		},
+		.driver_data = (void *)((ASOC_SDW_CODEC_SPKR) | (ASOC_SDW_ACP_DMIC)),
+	},
 	{}
 };
 
@@ -216,6 +230,8 @@ static int create_sdw_dailink(struct snd_soc_card *card,
 		}
 
 		switch (amd_ctx->acp_rev) {
+		case ACP6X_PCI_REV:
+		case ACP6XR_PCI_REV:
 		case ACP63_PCI_REV:
 			ret = get_acp63_cpu_pin_id(ffs(soc_end->link_mask) - 1,
 						   *be_id, &cpu_pin_id, dev);
@@ -329,6 +345,8 @@ static int create_sdw_dailinks(struct snd_soc_card *card,
 		return -ENOMEM;
 
 	switch (amd_ctx->acp_rev) {
+	case ACP6X_PCI_REV:
+	case ACP6XR_PCI_REV:
 	case ACP63_PCI_REV:
 	case ACP70_PCI_REV:
 	case ACP71_PCI_REV:
@@ -377,6 +395,8 @@ static int create_dmic_dailinks(struct snd_soc_card *card,
 		return -ENOMEM;
 
 	switch (amd_ctx->acp_rev) {
+	case ACP6X_PCI_REV:
+	case ACP6XR_PCI_REV:
 	case ACP63_PCI_REV:
 	case ACP70_PCI_REV:
 	case ACP71_PCI_REV:
diff --git a/sound/soc/amd/acp/soc_amd_sdw_common.h b/sound/soc/amd/acp/soc_amd_sdw_common.h
index 3930cc4..1f9bddd 100644
--- a/sound/soc/amd/acp/soc_amd_sdw_common.h
+++ b/sound/soc/amd/acp/soc_amd_sdw_common.h
@@ -18,6 +18,8 @@
 #define ACP63_SDW_MAX_LINKS		2
 
 #define AMD_SDW_MAX_GROUPS		9
+#define ACP6X_PCI_REV			0x60
+#define ACP6XR_PCI_REV			0x6f
 #define ACP63_PCI_REV			0x63
 #define ACP70_PCI_REV			0x70
 #define ACP71_PCI_REV			0x71