[PATCH 5/11] ASoC: amd: acp: add ACP6x (Rembrandt) SoundWire machine table

[Corey Smith <corsmith@gmail.com>]

Add an ACPI machine table for ACP6x platforms using two RT1316 SDCA
speaker amplifiers as an aggregated stereo pair on SoundWire link 0.
The HP Dragonfly Pro ONE (board 8A7F) exposes them as
_ADR 0x000030025D131601 (left) and 0x000031025D131601 (right).

Assisted-by: LLM
Signed-off-by: Corey Smith <corsmith@gmail.com>
---
 sound/soc/amd/acp/Makefile             |  2 +-
 sound/soc/amd/acp/amd-rmb-acpi-match.c | 63 ++++++++++++++++++++++++++
 sound/soc/amd/mach-config.h            |  1 +
 3 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 sound/soc/amd/acp/amd-rmb-acpi-match.c

diff --git a/sound/soc/amd/acp/Makefile b/sound/soc/amd/acp/Makefile
index ab5f9dc..0b9954b 100644
--- a/sound/soc/amd/acp/Makefile
+++ b/sound/soc/amd/acp/Makefile
@@ -23,7 +23,7 @@ snd-acp70-y := acp70.o
 snd-acp-mach-y     := acp-mach-common.o
 snd-acp-legacy-mach-y     := acp-legacy-mach.o acp3x-es83xx/acp3x-es83xx.o
 snd-acp-sof-mach-y     := acp-sof-mach.o
-snd-soc-acpi-amd-match-y := amd-acp63-acpi-match.o amd-acp70-acpi-match.o
+snd-soc-acpi-amd-match-y := amd-rmb-acpi-match.o amd-acp63-acpi-match.o amd-acp70-acpi-match.o
 snd-soc-acpi-amd-match-$(CONFIG_SND_SOC_ACPI_AMD_SDCA_QUIRKS) += soc-acpi-amd-sdca-quirks.o
 snd-acp-sdw-mach-y     := acp-sdw-mach-common.o
 snd-acp-sdw-sof-mach-y += acp-sdw-sof-mach.o
diff --git a/sound/soc/amd/acp/amd-rmb-acpi-match.c b/sound/soc/amd/acp/amd-rmb-acpi-match.c
new file mode 100644
index 0000000..9802efc
--- /dev/null
+++ b/sound/soc/amd/acp/amd-rmb-acpi-match.c
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * amd-rmb-acpi-match.c - tables and support for ACP6.x (Rembrandt)
+ * platform ACPI enumeration.
+ *
+ * The RT1316 endpoints and the single-link layout follow the ACP6.3
+ * tables in amd-acp63-acpi-match.c.
+ */
+
+#include <sound/soc-acpi.h>
+#include "../mach-config.h"
+
+static const struct snd_soc_acpi_endpoint spk_l_endpoint = {
+	.num = 0,
+	.aggregated = 1,
+	.group_position = 0,
+	.group_id = 1
+};
+
+static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
+	.num = 0,
+	.aggregated = 1,
+	.group_position = 1,
+	.group_id = 1
+};
+
+static const struct snd_soc_acpi_adr_device rt1316x2_adr[] = {
+	{
+		.adr = 0x000030025D131601ull,
+		.num_endpoints = 1,
+		.endpoints = &spk_l_endpoint,
+		.name_prefix = "rt1316-1"
+	},
+	{
+		.adr = 0x000031025D131601ull,
+		.num_endpoints = 1,
+		.endpoints = &spk_r_endpoint,
+		.name_prefix = "rt1316-2"
+	},
+};
+
+static const struct snd_soc_acpi_link_adr rmb_rt1316x2_l0u01[] = {
+	{
+		.mask = BIT(0),
+		.num_adr = ARRAY_SIZE(rt1316x2_adr),
+		.adr_d = rt1316x2_adr,
+	},
+	{}
+};
+
+struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sdw_machines[] = {
+	{
+		.link_mask = BIT(0),
+		.links = rmb_rt1316x2_l0u01,
+		.drv_name = "amd_sdw",
+	},
+	{},
+};
+EXPORT_SYMBOL(snd_soc_acpi_amd_rmb_sdw_machines);
+
+MODULE_DESCRIPTION("AMD ACP6.x (Rembrandt) tables and support for ACPI enumeration");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Corey Smith <corsmith@gmail.com>");
diff --git a/sound/soc/amd/mach-config.h b/sound/soc/amd/mach-config.h
index b602a98..150bab8 100644
--- a/sound/soc/amd/mach-config.h
+++ b/sound/soc/amd/mach-config.h
@@ -22,6 +22,7 @@
 extern struct snd_soc_acpi_mach snd_soc_acpi_amd_sof_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sof_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_amd_vangogh_sof_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_amd_rmb_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sdw_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sof_sdw_machines[];