From: Simon Trimmer <simont@opensource.cirrus.com>
To: broonie@kernel.org
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@opensource.cirrus.com, Vijendar.Mukunda@amd.com,
syed.sabakareem@amd.com,
Simon Trimmer <simont@opensource.cirrus.com>
Subject: [PATCH 2/4] ASoC: amd: acp: Rename Cirrus Logic component match entries to include link and uid
Date: Tue, 27 Jan 2026 17:34:47 +0000 [thread overview]
Message-ID: <f8f7fab5131ea6080421812dcce3e9ffc5b936e0.1769534442.git.simont@opensource.cirrus.com> (raw)
In-Reply-To: <cover.1769534442.git.simont@opensource.cirrus.com>
In preparation for having similar matches with multiple UIDs on the same
bus rename the match entries to include the bus link and device uid
numbers in their name using the lNuN convention.
Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
---
sound/soc/amd/acp/amd-acp70-acpi-match.c | 34 ++++++++++++------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/amd-acp70-acpi-match.c
index 93eb01a00a0c..44fab145aa59 100644
--- a/sound/soc/amd/acp/amd-acp70-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c
@@ -187,7 +187,7 @@ static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
},
};
-static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {
+static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] = {
{
.adr = 0x00003001FA424301ull,
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
@@ -196,7 +196,7 @@ static const struct snd_soc_acpi_adr_device cs42l43_0_adr[] = {
}
};
-static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = {
+static const struct snd_soc_acpi_adr_device cs42l43_l1u0_cs35l56x4_l1u0123_adr[] = {
{
.adr = 0x00013001FA424301ull,
.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
@@ -229,7 +229,7 @@ static const struct snd_soc_acpi_adr_device cs42l43_1_cs35l56x4_1_adr[] = {
},
};
-static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] = {
+static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] = {
{
.adr = 0x00013301FA355601ull,
.num_endpoints = 1,
@@ -256,34 +256,34 @@ static const struct snd_soc_acpi_adr_device cs35l56x4_1_adr[] = {
},
};
-static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1_cs35l56x4_l1[] = {
+static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u0123[] = {
{
.mask = BIT(1),
- .num_adr = ARRAY_SIZE(cs42l43_1_cs35l56x4_1_adr),
- .adr_d = cs42l43_1_cs35l56x4_1_adr,
+ .num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr),
+ .adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr,
},
{}
};
-static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0_cs35l56x4_l1[] = {
+static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u0_cs35l56x4_l1u3210[] = {
{
.mask = BIT(0),
- .num_adr = ARRAY_SIZE(cs42l43_0_adr),
- .adr_d = cs42l43_0_adr,
+ .num_adr = ARRAY_SIZE(cs42l43_l0u0_adr),
+ .adr_d = cs42l43_l0u0_adr,
},
{
.mask = BIT(1),
- .num_adr = ARRAY_SIZE(cs35l56x4_1_adr),
- .adr_d = cs35l56x4_1_adr,
+ .num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
+ .adr_d = cs35l56x4_l1u3210_adr,
},
{}
};
-static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1[] = {
+static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] = {
{
.mask = BIT(1),
- .num_adr = ARRAY_SIZE(cs35l56x4_1_adr),
- .adr_d = cs35l56x4_1_adr,
+ .num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
+ .adr_d = cs35l56x4_l1u3210_adr,
},
{}
};
@@ -333,17 +333,17 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
},
{
.link_mask = BIT(0) | BIT(1),
- .links = acp70_cs42l43_l0_cs35l56x4_l1,
+ .links = acp70_cs42l43_l0u0_cs35l56x4_l1u3210,
.drv_name = "amd_sdw",
},
{
.link_mask = BIT(1),
- .links = acp70_cs42l43_l1_cs35l56x4_l1,
+ .links = acp70_cs42l43_l1u0_cs35l56x4_l1u0123,
.drv_name = "amd_sdw",
},
{
.link_mask = BIT(1),
- .links = acp70_cs35l56x4_l1,
+ .links = acp70_cs35l56x4_l1u3210,
.drv_name = "amd_sdw",
},
{
--
2.43.0
next prev parent reply other threads:[~2026-01-27 17:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-27 17:34 [PATCH 0/4] ASoC: amd: acp: Add ACP7.0 match entries for Cirrus Logic parts Simon Trimmer
2026-01-27 17:34 ` [PATCH 1/4] ASoC: amd: acp: Sort match table into most specific first Simon Trimmer
2026-01-27 17:34 ` Simon Trimmer [this message]
2026-01-27 17:34 ` [PATCH 3/4] ASoC: amd: acp: Sort Cirrus Logic match entries Simon Trimmer
2026-01-27 17:34 ` [PATCH 4/4] ASoC: amd: acp: Add ACP7.0 match entries for Cirrus Logic parts Simon Trimmer
2026-02-03 12:05 ` [PATCH 0/4] " 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=f8f7fab5131ea6080421812dcce3e9ffc5b936e0.1769534442.git.simont@opensource.cirrus.com \
--to=simont@opensource.cirrus.com \
--cc=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=syed.sabakareem@amd.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
all inboxes | Powered by JetHome®