Skip to content

Commit ef881d1

Browse files
macchianMac Chiang
authored andcommitted
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 descending order. 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>
1 parent f3ce593 commit ef881d1

1 file changed

Lines changed: 15 additions & 15 deletions

File tree

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
483483
.get_function_tplg_files = sof_sdw_get_tplg_files,
484484
},
485485
{
486-
.link_mask = BIT(0),
487-
.links = arl_cs42l43_l0,
486+
.link_mask = BIT(0) | BIT(2),
487+
.links = arl_rt722_l0_rt1320_l2,
488488
.drv_name = "sof_sdw",
489-
.sof_tplg_filename = "sof-arl-cs42l43-l0.tplg",
489+
.sof_tplg_filename = "sof-arl-rt722-l0_rt1320-l2.tplg",
490490
.get_function_tplg_files = sof_sdw_get_tplg_files,
491491
},
492+
{
493+
.link_mask = BIT(0) | BIT(3),
494+
.links = arl_rt711_l0_rt1316_l3,
495+
.drv_name = "sof_sdw",
496+
.sof_tplg_filename = "sof-arl-rt711-l0-rt1316-l3.tplg",
497+
},
492498
{
493499
.link_mask = BIT(2) | BIT(3),
494500
.links = arl_cs42l43_l2_cs35l56_l3,
@@ -497,18 +503,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
497503
.get_function_tplg_files = sof_sdw_get_tplg_files,
498504
},
499505
{
500-
.link_mask = BIT(2),
501-
.links = arl_cs42l43_l2,
506+
.link_mask = BIT(0),
507+
.links = arl_cs42l43_l0,
502508
.drv_name = "sof_sdw",
503-
.sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
509+
.sof_tplg_filename = "sof-arl-cs42l43-l0.tplg",
504510
.get_function_tplg_files = sof_sdw_get_tplg_files,
505511
},
506-
{
507-
.link_mask = BIT(0) | BIT(3),
508-
.links = arl_rt711_l0_rt1316_l3,
509-
.drv_name = "sof_sdw",
510-
.sof_tplg_filename = "sof-arl-rt711-l0-rt1316-l3.tplg",
511-
},
512512
{
513513
.link_mask = 0x1, /* link0 required */
514514
.links = arl_rvp,
@@ -522,10 +522,10 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_arl_sdw_machines[] = {
522522
.sof_tplg_filename = "sof-arl-rt711-l0.tplg",
523523
},
524524
{
525-
.link_mask = BIT(0) | BIT(2),
526-
.links = arl_rt722_l0_rt1320_l2,
525+
.link_mask = BIT(2),
526+
.links = arl_cs42l43_l2,
527527
.drv_name = "sof_sdw",
528-
.sof_tplg_filename = "sof-arl-rt722-l0_rt1320-l2.tplg",
528+
.sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
529529
.get_function_tplg_files = sof_sdw_get_tplg_files,
530530
},
531531
{},

0 commit comments

Comments
 (0)