Unverified Commit ac2f21ce authored by Mac Chiang's avatar Mac Chiang Committed by Mark Brown
Browse files

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 08095e20
("ASoC: Intel: soc-acpi-intel-ptl-match: Sort ACPI link/machine tables").

Signed-off-by: default avatarMac Chiang <mac.chiang@intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://patch.msgid.link/20260508104239.1247525-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5d691905

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

+15 −15
Original line number Diff line number Diff line
@@ -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,

	},

	{},