* [PATCH] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts
@ 2026-02-24 13:03 Simon Trimmer
2026-02-27 4:45 ` Mukunda,Vijendar
2026-03-03 11:20 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Simon Trimmer @ 2026-02-24 13:03 UTC (permalink / raw)
To: broonie; +Cc: linux-sound, linux-kernel, patches, Vijendar.Mukunda,
Simon Trimmer
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>
---
sound/soc/amd/acp/amd-acp63-acpi-match.c | 413 +++++++++++++++++++++++
1 file changed, 413 insertions(+)
diff --git a/sound/soc/amd/acp/amd-acp63-acpi-match.c b/sound/soc/amd/acp/amd-acp63-acpi-match.c
index 9b6a49c051cd..1dbbaba3c75b 100644
--- 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);
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts
2026-02-24 13:03 [PATCH] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts Simon Trimmer
@ 2026-02-27 4:45 ` Mukunda,Vijendar
2026-03-03 11:20 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mukunda,Vijendar @ 2026-02-27 4:45 UTC (permalink / raw)
To: Simon Trimmer, broonie; +Cc: linux-sound, linux-kernel, patches
On 24/02/26 18:33, Simon Trimmer wrote:
> 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>
Reviewed-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
> ---
> sound/soc/amd/acp/amd-acp63-acpi-match.c | 413 +++++++++++++++++++++++
> 1 file changed, 413 insertions(+)
>
> diff --git a/sound/soc/amd/acp/amd-acp63-acpi-match.c b/sound/soc/amd/acp/amd-acp63-acpi-match.c
> index 9b6a49c051cd..1dbbaba3c75b 100644
> --- 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);
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts
2026-02-24 13:03 [PATCH] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts Simon Trimmer
2026-02-27 4:45 ` Mukunda,Vijendar
@ 2026-03-03 11:20 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2026-03-03 11:20 UTC (permalink / raw)
To: Simon Trimmer; +Cc: linux-sound, linux-kernel, patches, Vijendar.Mukunda
On Tue, 24 Feb 2026 13:03:07 +0000, Simon Trimmer wrote:
> 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
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts
commit: fd13fc700e3e239826a46448bf7f01847dd26f5a
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-03-03 11:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-24 13:03 [PATCH] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts Simon Trimmer
2026-02-27 4:45 ` Mukunda,Vijendar
2026-03-03 11:20 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox