mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 3/4] ASoC: amd: acp: Sort Cirrus Logic match entries
Date: Tue, 27 Jan 2026 17:34:48 +0000	[thread overview]
Message-ID: <0a756390dfb7e928246d0f35c611f175e1311e55.1769534442.git.simont@opensource.cirrus.com> (raw)
In-Reply-To: <cover.1769534442.git.simont@opensource.cirrus.com>

In preparation for adding more match entries sort the ones that are
present.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
---
 sound/soc/amd/acp/amd-acp70-acpi-match.c | 62 ++++++++++++------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/amd-acp70-acpi-match.c
index 44fab145aa59..de8f5a2a8e9d 100644
--- a/sound/soc/amd/acp/amd-acp70-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c
@@ -187,80 +187,80 @@ static const struct snd_soc_acpi_endpoint cs42l43_endpoints[] = {
 	},
 };
 
-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_l1u0_cs35l56x4_l1u0123_adr[] = {
-	{
-		.adr = 0x00013001FA424301ull,
-		.num_endpoints = ARRAY_SIZE(cs42l43_endpoints),
-		.endpoints = cs42l43_endpoints,
-		.name_prefix = "cs42l43"
-	},
+static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] = {
 	{
-		.adr = 0x00013001FA355601ull,
+		.adr = 0x00013301FA355601ull,
 		.num_endpoints = 1,
 		.endpoints = &spk_l_endpoint,
 		.name_prefix = "AMP1"
 	},
 	{
-		.adr = 0x00013101FA355601ull,
+		.adr = 0x00013201FA355601ull,
 		.num_endpoints = 1,
 		.endpoints = &spk_r_endpoint,
 		.name_prefix = "AMP2"
 	},
 	{
-		.adr = 0x00013201FA355601ull,
+		.adr = 0x00013101FA355601ull,
 		.num_endpoints = 1,
 		.endpoints = &spk_2_endpoint,
 		.name_prefix = "AMP3"
 	},
 	{
-		.adr = 0x00013301FA355601ull,
+		.adr = 0x00013001FA355601ull,
 		.num_endpoints = 1,
 		.endpoints = &spk_3_endpoint,
 		.name_prefix = "AMP4"
 	},
 };
 
-static const struct snd_soc_acpi_adr_device cs35l56x4_l1u3210_adr[] = {
+static const struct snd_soc_acpi_adr_device cs42l43_l0u0_adr[] = {
 	{
-		.adr = 0x00013301FA355601ull,
+		.adr = 0x00003001FA424301ull,
+		.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 = 0x00013201FA355601ull,
+		.adr = 0x00013101FA355601ull,
 		.num_endpoints = 1,
 		.endpoints = &spk_r_endpoint,
 		.name_prefix = "AMP2"
 	},
 	{
-		.adr = 0x00013101FA355601ull,
+		.adr = 0x00013201FA355601ull,
 		.num_endpoints = 1,
 		.endpoints = &spk_2_endpoint,
 		.name_prefix = "AMP3"
 	},
 	{
-		.adr = 0x00013001FA355601ull,
+		.adr = 0x00013301FA355601ull,
 		.num_endpoints = 1,
 		.endpoints = &spk_3_endpoint,
 		.name_prefix = "AMP4"
 	},
 };
 
-static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u0123[] = {
+static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] = {
 	{
 		.mask = BIT(1),
-		.num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr),
-		.adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr,
+		.num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
+		.adr_d = cs35l56x4_l1u3210_adr,
 	},
 	{}
 };
@@ -279,11 +279,11 @@ static const struct snd_soc_acpi_link_adr acp70_cs42l43_l0u0_cs35l56x4_l1u3210[]
 	{}
 };
 
-static const struct snd_soc_acpi_link_adr acp70_cs35l56x4_l1u3210[] = {
+static const struct snd_soc_acpi_link_adr acp70_cs42l43_l1u0_cs35l56x4_l1u0123[] = {
 	{
 		.mask = BIT(1),
-		.num_adr = ARRAY_SIZE(cs35l56x4_l1u3210_adr),
-		.adr_d = cs35l56x4_l1u3210_adr,
+		.num_adr = ARRAY_SIZE(cs42l43_l1u0_cs35l56x4_l1u0123_adr),
+		.adr_d = cs42l43_l1u0_cs35l56x4_l1u0123_adr,
 	},
 	{}
 };
-- 
2.43.0


  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 ` [PATCH 2/4] ASoC: amd: acp: Rename Cirrus Logic component match entries to include link and uid Simon Trimmer
2026-01-27 17:34 ` Simon Trimmer [this message]
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=0a756390dfb7e928246d0f35c611f175e1311e55.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®