ASoC: amd: acp: Sort match table into most specific first

Match tables should be sorted so that more complex combinations of
device matches are before simpler combinations, with the single device
matches at the end.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Link: https://patch.msgid.link/50c385a7f64ccd75cabf49eddbc0ec6fe13f3252.1769534442.git.simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/amd-acp70-acpi-match.c b/sound/soc/amd/acp/amd-acp70-acpi-match.c
index c5f42bd79548891ca1bdf5b1a60ea246f031b839..93eb01a00a0c81685b6d2d8b908ba70d4ba92412 100644 (file)
--- a/sound/soc/amd/acp/amd-acp70-acpi-match.c
+++ b/sound/soc/amd/acp/amd-acp70-acpi-match.c
@@ -326,11 +326,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
                .links = acp70_rt722_l0_rt1320_l1,
                .drv_name = "amd_sdw",
        },
-       {
-               .link_mask = BIT(0),
-               .links = acp70_rt722_only,
-               .drv_name = "amd_sdw",
-       },
        {
                .link_mask = BIT(0) | BIT(1),
                .links = acp70_4_in_1_sdca,
@@ -351,6 +346,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_amd_acp70_sdw_machines[] = {
                .links = acp70_cs35l56x4_l1,
                .drv_name = "amd_sdw",
        },
+       {
+               .link_mask = BIT(0),
+               .links = acp70_rt722_only,
+               .drv_name = "amd_sdw",
+       },
        {
                .link_mask = BIT(1),
                .links = acp70_alc712_vb_l1,