From: "Mukunda,Vijendar" <vijendar.mukunda@amd.com>
To: Simon Trimmer <simont@opensource.cirrus.com>, broonie@kernel.org
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@opensource.cirrus.com
Subject: Re: [PATCH] ASoC: amd: acp: Add ACP6.3 match entries for Cirrus Logic parts
Date: Fri, 27 Feb 2026 10:15:06 +0530 [thread overview]
Message-ID: <6826e8fa-258d-446e-b18d-98b96ca09d59@amd.com> (raw)
In-Reply-To: <20260224130307.526626-1-simont@opensource.cirrus.com>
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);
next prev parent reply other threads:[~2026-02-27 4:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2026-03-03 11:20 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6826e8fa-258d-446e-b18d-98b96ca09d59@amd.com \
--to=vijendar.mukunda@amd.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=simont@opensource.cirrus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox