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

Sort ACPI machine tables by link count to ensure that configurations
with the highest number of matching links are selected.

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

Signed-off-by: Mac Chiang <mac.chiang@intel.com>

Author: macchian

sound/soc/intel/common/soc-acpi-intel-adl-match.c

@@ -682,12 +682,6 @@ EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_machines);
 
 /* this table is used when there is no I2S codec present */
 struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
-	{
-		.link_mask = BIT(0) | BIT(2) | BIT(3),
-		.links = adl_cs42l43_l0_cs35l56_l23,
-		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-adl-cs42l43-l0-cs35l56-l23.tplg",
-	},
 	{
 		.link_mask = 0xF, /* 4 active links required */
 		.links = adl_default,
@@ -713,22 +707,22 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
 		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01-rt714-l3.tplg",
 	},
 	{
-		.link_mask = 0x7, /* rt1316 on link0 and link1 & rt711 on link2*/
-		.links = adl_sdw_rt711_link2_rt1316_link01,
+		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
+		.links = adl_sdw_rt1316_link12_rt714_link0,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01.tplg",
+		.sof_tplg_filename = "sof-adl-rt1316-l12-rt714-l0.tplg",
 	},
 	{
-		.link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */
-		.links = adl_sdw_rt1316_link2_rt714_link3,
+		.link_mask = 0x7, /* rt1316 on link0 and link1 & rt711 on link2*/
+		.links = adl_sdw_rt711_link2_rt1316_link01,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg",
+		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01.tplg",
 	},
 	{
-		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
-		.links = adl_sdw_rt1316_link12_rt714_link0,
+		.link_mask = BIT(0) | BIT(2) | BIT(3),
+		.links = adl_cs42l43_l0_cs35l56_l23,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-adl-rt1316-l12-rt714-l0.tplg",
+		.sof_tplg_filename = "sof-adl-cs42l43-l0-cs35l56-l23.tplg",
 	},
 	{
 		.link_mask = 0x3, /* rt1316 on link1 & rt714 on link0 */
@@ -742,17 +736,35 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l0.tplg",
 	},
+	{
+		.link_mask = 0x5, /* 2 active links required */
+		.links = adl_sdw_rt711_link0_rt1316_link2,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l2.tplg",
+	},
+	{
+		.link_mask = 0x5, /* rt5682 on link0 & 2xmax98373 on link 2 */
+		.links = adl_chromebook_base,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-adl-sdw-max98373-rt5682.tplg",
+	},
+	{
+		.link_mask = BIT(0) | BIT(2),
+		.links = adl_sdw_rt1316_link02,
+		.drv_name = "sof_sdw",
+		.sof_tplg_filename = "sof-adl-rt1316-l02.tplg",
+	},
 	{
 		.link_mask = 0x9, /* 2 active links required */
 		.links = adl_sdw_rt711_link0_rt1316_link3,
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l3.tplg",
 	},
 	{
-		.link_mask = 0x5, /* 2 active links required */
-		.links = adl_sdw_rt711_link0_rt1316_link2,
+		.link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */
+		.links = adl_sdw_rt1316_link2_rt714_link3,
 		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l2.tplg",
+		.sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg",
 	},
 	{
 		.link_mask = 0x1, /* link0 required */
@@ -766,18 +778,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
 		.drv_name = "sof_sdw",
 		.sof_tplg_filename = "sof-adl-rt711.tplg",
 	},
-	{
-		.link_mask = 0x5, /* rt5682 on link0 & 2xmax98373 on link 2 */
-		.links = adl_chromebook_base,
-		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-adl-sdw-max98373-rt5682.tplg",
-	},
-	{
-		.link_mask = BIT(0) | BIT(2),
-		.links = adl_sdw_rt1316_link02,
-		.drv_name = "sof_sdw",
-		.sof_tplg_filename = "sof-adl-rt1316-l02.tplg",
-	},
 	{},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_adl_sdw_machines);