diff options
| author | Simon Trimmer <simont@opensource.cirrus.com> | 2026-01-27 17:34:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-02-02 13:24:11 +0000 |
| commit | 3de9cf4782492b19c9d8bdac309462027e18ab43 (patch) | |
| tree | 66c9f7424a043d89c11975c0e2ec00dc54639c95 | |
| parent | 5eb3fc48d37157fd83315bcbb5693269fc497fb7 (diff) | |
ASoC: amd: acp: Sort Cirrus Logic match entries
In preparation for adding more match entries sort the ones that are
present.
Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/0a756390dfb7e928246d0f35c611f175e1311e55.1769534442.git.simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/amd/acp/amd-acp70-acpi-match.c | 62 |
1 files 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, }, {} }; |