ASoC: amd: acp: Add ACP7.0 match entries for cs35l56 and cs42l43

This adds some match entries for a few system configurations:

cs42l43 link 0 UID 0
cs35l56 link 1 UID 0
cs35l56 link 1 UID 1
cs35l56 link 1 UID 2
cs35l56 link 1 UID 3

cs42l43 link 1 UID 0
cs35l56 link 1 UID 0
cs35l56 link 1 UID 1
cs35l56 link 1 UID 2
cs35l56 link 1 UID 3

cs35l56 link 1 UID 0
cs35l56 link 1 UID 1
cs35l56 link 1 UID 2
cs35l56 link 1 UID 3

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20251016150837.320886-1-simont@opensource.cirrus.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 dcecac792e6dfaea4246d5346b3f57db2d593324..871b4f054a848ef02744a6b54e88428ff9146615 100644 (file)
--- a/sound/soc/amd/acp/amd-acp70-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c
@@ -30,6 +30,20 @@ static const struct snd_soc_acpi_endpoint spk_r_endpoint = {
        .group_id = 1
 };
 
+static const struct snd_soc_acpi_endpoint spk_2_endpoint = {
+       .num = 0,
+       .aggregated = 1,
+       .group_position = 2,
+       .group_id = 1
+};
+
+static const struct snd_soc_acpi_endpoint spk_3_endpoint = {
+       .num = 0,
+       .aggregated = 1,
+       .group_position = 3,
+       .group_id = 1
+};
+
 static const struct snd_soc_acpi_adr_device rt711_rt1316_group_adr[] = {
        {
                .adr = 0x000030025D071101ull,
@@ -112,6 +126,134 @@ static const struct snd_soc_acpi_adr_device rt1320_1_single_adr[] = {
        }
 };
 
+static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
+       { /* Jack Playback Endpoint */
+               .num = 0,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       { /* DMIC Capture Endpoint */
+               .num = 1,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       { /* Jack Capture Endpoint */
+               .num = 2,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+       { /* Speaker Playback Endpoint */
+               .num = 3,
+               .aggregated = 0,
+               .group_position = 0,
+               .group_id = 0,
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {
+       {
+               .adr = 0x00003001FA424301ull,
+               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
+               .endpoints = cs42l43_endpoints,
+               .name_prefix = "cs42l43"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = {
+       {
+               .adr = 0x00013001FA424301ull,
+               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
+               .endpoints = cs42l43_endpoints,
+               .name_prefix = "cs42l43"
+       },
+       {
+               .adr = 0x00013001FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00013101FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       },
+       {
+               .adr = 0x00013201FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_2_endpoint,
+               .name_prefix = "AMP3"
+       },
+       {
+               .adr = 0x00013301FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_3_endpoint,
+               .name_prefix = "AMP4"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] = {
+       {
+               .adr = 0x00013301FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00013201FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       },
+       {
+               .adr = 0x00013101FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_2_endpoint,
+               .name_prefix = "AMP3"
+       },
+       {
+               .adr = 0x00013001FA355601ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_3_endpoint,
+               .name_prefix = "AMP4"
+       },
+};
+
+static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1_cs35l56x4_l1[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs42l43_1_cs35l56x4_1_adr),
+               .adr_d = cs42l43_1_cs35l56x4_1_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0_cs35l56x4_l1[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43_0_adr),
+               .adr_d = cs42l43_0_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l56x4_1_adr),
+               .adr_d = cs35l56x4_1_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l56x4_1_adr),
+               .adr_d = cs35l56x4_1_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr acp70_rt722_only[] = {
        {
                .mask = BIT(0),
@@ -151,6 +293,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
                .links = acp70_4_in_1_sdca,
                .drv_name = "amd_sdw",
        },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = acp70_cs42l43_l0_cs35l56x4_l1,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(1),
+               .links = acp70_cs42l43_l1_cs35l56x4_l1,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(1),
+               .links = acp70_cs35l56x4_l1,
+               .drv_name = "amd_sdw",
+       },
        {},
 };
 EXPORT_SYMBOL(snd_soc_acpi_amd_acp70_sdw_machines);