ASoC: amd: acp: add PX13 SoundWire machine link for rt721+tas2783x2

Add an ACP70 SoundWire machine entry for ASUS PX13
(HN7306EA/HN7306EAC) with rt721 and two TAS2783 amps on link1.

Describe rt721 with jack/DMIC endpoints on this platform and add
explicit left/right TAS2783 speaker endpoint mapping via name prefixes.

Signed-off-by: Hasun Park <hasunpark@gmail.com>
Link: https://patch.msgid.link/20260308151654.29059-3-hasunpark@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/amd-acp70-acpi-match.c
index 7a567ba022920cdf8616f8ee292f487d75171976..1ae43df5da6cee90846bbfd34cbf8bd909037947 100644 (file)
--- a/sound/soc/amd/acp/amd-acp70-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c
@@ -69,6 +69,28 @@ static const struct snd_soc_acpi_endpoint jack_amp_g1_dmic_endpoints[] = {
        },
 };
 
+static const struct snd_soc_acpi_endpoint jack_dmic_endpoints[] = {
+       /* Jack Endpoint */
+       {
+               .num = 0,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       /* DMIC Endpoint */
+       {
+               /*
+                * rt721 endpoint #2 maps to AIF3 (internal DMIC capture).
+                * Endpoint #1 is AIF2 amp path and is handled by external amps
+                * on this platform.
+                */
+               .num = 2,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+};
+
 static const struct snd_soc_acpi_adr_device rt712_vb_1_group1_adr[] = {
        {
                .adr = 0x000130025D071201ull,
@@ -563,6 +585,40 @@ static const struct snd_soc_acpi_link_adr acp70_rt1320_l0_rt722_l1[] = {
        {}
 };
 
+static const struct snd_soc_acpi_adr_device rt721_l1u0_tas2783x2_l1u8b_adr[] = {
+       {
+               .adr = 0x000130025D072101ull,
+               /*
+                * On this platform speakers are provided by two TAS2783 amps.
+                * Keep rt721 as UAJ + DMIC only.
+                */
+               .num_endpoints = ARRAY_SIZE(jack_dmic_endpoints),
+               .endpoints = jack_dmic_endpoints,
+               .name_prefix = "rt721",
+       },
+       {
+               .adr = 0x0001380102000001ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "tas2783-1",
+       },
+       {
+               .adr = 0x00013B0102000001ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "tas2783-2",
+       },
+};
+
+static const struct snd_soc_acpi_link_adr acp70_rt721_l1u0_tas2783x2_l1u8b[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(rt721_l1u0_tas2783x2_l1u8b_adr),
+               .adr_d = rt721_l1u0_tas2783x2_l1u8b_adr,
+       },
+       {}
+};
+
 struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
        {
                .link_mask = BIT(0) | BIT(1),
@@ -650,6 +706,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
                .machine_check = snd_soc_acpi_amd_sdca_is_device_rt712_vb,
                .drv_name = "amd_sdw",
        },
+       {
+               .link_mask = BIT(1),
+               .links = acp70_rt721_l1u0_tas2783x2_l1u8b,
+               .drv_name = "amd_sdw",
+       },
        {},
 };
 EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sdw_machines);