ASoC: Intel: soc-acpi-intel-arl-match: Reorder ACPI machine tables

When the SOF device driver enumerates the machine tables,
it selects the entry with the most numbers of matched links in
ascending order.

Align the ordering with commit 08095e20995ad6e3648af7416c90163627fe7e44
("ASoC: Intel: soc-acpi-intel-ptl-match: Sort ACPI link/machine tables").

Signed-off-by: Mac Chiang <mac.chiang@intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20260508104239.1247525-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-arl-match.c b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
index c952f7d2b2c0e0bab877ea5df387f2107cf7a80e..cd4023ccadeb65d4b493859cb30e7f28d60694db 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-arl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-arl-match.c
@@ -483,12 +483,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
        {
-               .link_mask = BIT(0),
-               .links = arl_cs42l43_l0,
+               .link_mask = BIT(0) | BIT(2),
+               .links = arl_rt722_l0_rt1320_l2,
                .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-arl-cs42l43-l0.tplg",
+               .sof_tplg_filename = "sof-arl-rt722-l0_rt1320-l2.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
+       {
+               .link_mask = BIT(0) | BIT(3),
+               .links = arl_rt711_l0_rt1316_l3,
+               .drv_name = "sof_sdw",
+               .sof_tplg_filename = "sof-arl-rt711-l0-rt1316-l3.tplg",
+       },
        {
                .link_mask = BIT(2) | BIT(3),
                .links = arl_cs42l43_l2_cs35l56_l3,
@@ -497,18 +503,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
        {
-               .link_mask = BIT(2),
-               .links = arl_cs42l43_l2,
+               .link_mask = BIT(0),
+               .links = arl_cs42l43_l0,
                .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
+               .sof_tplg_filename = "sof-arl-cs42l43-l0.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
-       {
-               .link_mask = BIT(0) | BIT(3),
-               .links = arl_rt711_l0_rt1316_l3,
-               .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-arl-rt711-l0-rt1316-l3.tplg",
-       },
        {
                .link_mask = 0x1, /* link0 required */
                .links = arl_rvp,
@@ -522,10 +522,10 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
                .sof_tplg_filename = "sof-arl-rt711-l0.tplg",
        },
        {
-               .link_mask = BIT(0) | BIT(2),
-               .links = arl_rt722_l0_rt1320_l2,
+               .link_mask = BIT(2),
+               .links = arl_cs42l43_l2,
                .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-arl-rt722-l0_rt1320-l2.tplg",
+               .sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
        {},