ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts

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

cs42l45 link 1 UID 0
cs35l63 link 0 UID 0
cs35l63 link 0 UID 2
cs35l63 link 0 UID 4
cs35l63 link 0 UID 6

cs42l45 link 0 UID 0
cs35l63 link 1 UID 0
cs35l63 link 1 UID 1

cs42l45 link 0 UID 0
cs35l63 link 1 UID 1
cs35l63 link 1 UID 3

cs42l45 link 1 UID 0
cs35l63 link 0 UID 0
cs35l63 link 0 UID 1

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

cs35l63 link 0 UID 0
cs35l63 link 0 UID 2
cs35l63 link 0 UID 4
cs35l63 link 0 UID 6

cs42l43 link 0 UID 1

cs42l43b link 0 UID 1

cs42l45 link 0 UID 0

cs42l45 link 1 UID 0

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/20260224130307.526626-1-simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/amd-acp63-acpi-match.c b/sound/soc/amd/acp/amd-acp63-acpi-match.c
index 9b6a49c051cda941f8baf5536ee70563e34692ac..1dbbaba3c75b3818a83469de302afecb390bea6f 100644 (file)
--- a/sound/soc/amd/acp/amd-acp63-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp63-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,
@@ -103,6 +117,345 @@ static const struct snd_soc_acpi_adr_device rt722_0_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 cs35l56x4_l1u3210_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_adr_device cs35l63x2_l0u01_adr[] = {
+       {
+               .adr = 0x00003001FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00003101FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs35l63x2_l1u01_adr[] = {
+       {
+               .adr = 0x00013001FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00013101FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs35l63x2_l1u13_adr[] = {
+       {
+               .adr = 0x00013101FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00013301FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs35l63x4_l0u0246_adr[] = {
+       {
+               .adr = 0x00003001FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_l_endpoint,
+               .name_prefix = "AMP1"
+       },
+       {
+               .adr = 0x00003201FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_r_endpoint,
+               .name_prefix = "AMP2"
+       },
+       {
+               .adr = 0x00003401FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_2_endpoint,
+               .name_prefix = "AMP3"
+       },
+       {
+               .adr = 0x00003601FA356301ull,
+               .num_endpoints = 1,
+               .endpoints = &spk_3_endpoint,
+               .name_prefix = "AMP4"
+       },
+};
+
+static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] = {
+       {
+               .adr = 0x00003001FA424301ull,
+               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
+               .endpoints = cs42l43_endpoints,
+               .name_prefix = "cs42l43"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs42l43_l0u1_adr[] = {
+       {
+               .adr = 0x00003101FA424301ull,
+               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
+               .endpoints = cs42l43_endpoints,
+               .name_prefix = "cs42l43"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs42l43b_l0u1_adr[] = {
+       {
+               .adr = 0x00003101FA2A3B01ull,
+               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
+               .endpoints = cs42l43_endpoints,
+               .name_prefix = "cs42l43"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123_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 cs42l45_l0u0_adr[] = {
+       {
+               .adr = 0x00003001FA424501ull,
+               /* Re-use endpoints, but cs42l45 has no speaker */
+               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints) - 1,
+               .endpoints = cs42l43_endpoints,
+               .name_prefix = "cs42l45"
+       }
+};
+
+static const struct snd_soc_acpi_adr_device cs42l45_l1u0_adr[] = {
+       {
+               .adr = 0x00013001FA424501ull,
+               /* Re-use endpoints, but cs42l45 has no speaker */
+               .num_endpoints = ARRAY_SIZE(cs42l43_endpoints) - 1,
+               .endpoints = cs42l43_endpoints,
+               .name_prefix = "cs42l45"
+       }
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs35l56x4_l1u3210[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
+               .adr_d = cs35l56x4_l1u3210_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs35l63x4_l0u0246[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs35l63x4_l0u0246_adr),
+               .adr_d = cs35l63x4_l0u0246_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l43_l0u1[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43_l0u1_adr),
+               .adr_d = cs42l43_l0u1_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l43b_l0u1[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43b_l0u1_adr),
+               .adr_d = cs42l43b_l0u1_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l43_l0u0_cs35l56x4_l1u3210[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l43_l0u0_adr),
+               .adr_d = cs42l43_l0u0_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
+               .adr_d = cs35l56x4_l1u3210_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l43_l1u0_cs35l56x4_l1u0123[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr),
+               .adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l45_l0u0[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l45_l0u0_adr),
+               .adr_d = cs42l45_l0u0_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l45_l0u0_cs35l63x2_l1u01[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l45_l0u0_adr),
+               .adr_d = cs42l45_l0u0_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l63x2_l1u01_adr),
+               .adr_d = cs35l63x2_l1u01_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l45_l0u0_cs35l63x2_l1u13[] = {
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs42l45_l0u0_adr),
+               .adr_d = cs42l45_l0u0_adr,
+       },
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs35l63x2_l1u13_adr),
+               .adr_d = cs35l63x2_l1u13_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l45_l1u0[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs42l45_l1u0_adr),
+               .adr_d = cs42l45_l1u0_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l45_l1u0_cs35l63x2_l0u01[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs42l45_l1u0_adr),
+               .adr_d = cs42l45_l1u0_adr,
+       },
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs35l63x2_l0u01_adr),
+               .adr_d = cs35l63x2_l0u01_adr,
+       },
+       {}
+};
+
+static const struct snd_soc_acpi_link_adr acp63_cs42l45_l1u0_cs35l63x4_l0u0246[] = {
+       {
+               .mask = BIT(1),
+               .num_adr = ARRAY_SIZE(cs42l45_l1u0_adr),
+               .adr_d = cs42l45_l1u0_adr,
+       },
+       {
+               .mask = BIT(0),
+               .num_adr = ARRAY_SIZE(cs35l63x4_l0u0246_adr),
+               .adr_d = cs35l63x4_l0u0246_adr,
+       },
+       {}
+};
+
 static const struct snd_soc_acpi_link_adr acp63_rt722_only[] = {
        {
                .mask = BIT(0),
@@ -135,6 +488,66 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp63_sdw_machines[] = {
                .links = acp63_4_in_1_sdca,
                .drv_name = "amd_sdw",
        },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = acp63_cs42l43_l0u0_cs35l56x4_l1u3210,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = acp63_cs42l45_l1u0_cs35l63x4_l0u0246,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = acp63_cs42l45_l0u0_cs35l63x2_l1u01,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = acp63_cs42l45_l0u0_cs35l63x2_l1u13,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0) | BIT(1),
+               .links = acp63_cs42l45_l1u0_cs35l63x2_l0u01,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(1),
+               .links = acp63_cs42l43_l1u0_cs35l56x4_l1u0123,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(1),
+               .links = acp63_cs35l56x4_l1u3210,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0),
+               .links = acp63_cs35l63x4_l0u0246,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0),
+               .links = acp63_cs42l43_l0u1,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0),
+               .links = acp63_cs42l43b_l0u1,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(0),
+               .links = acp63_cs42l45_l0u0,
+               .drv_name = "amd_sdw",
+       },
+       {
+               .link_mask = BIT(1),
+               .links = acp63_cs42l45_l1u0,
+               .drv_name = "amd_sdw",
+       },
        {},
 };
 EXPORT_SYMBOL(snd_soc_acpi_amd_acp63_sdw_machines);