From f43b0901cd6f319fe47fd5eaf77a39be8449f288 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Fri, 5 Apr 2024 13:25:50 -0500 Subject: [PATCH] fixup! ASoC: Intel: soc-acpi: add support for HP Omen14 SoundWire configuration The new entry was added before the SDCA AOIC, which causes MTL SDW AOIC to select 2 devices only - which as a result causes a fail during the topology load. Closes: https://github.com/thesofproject/linux/issues/4906 Signed-off-by: Pierre-Louis Bossart --- sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c index 7ae9e0c6227696..f95490a16b5512 100644 --- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c @@ -703,12 +703,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-mtl-rt713-l0-rt1316-l12.tplg", }, - { - .link_mask = 0x9, /* 2 active links required */ - .links = mtl_rt711_l0_rt1316_l3, - .drv_name = "sof_sdw", - .sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l3.tplg", - }, { .link_mask = BIT(3) | BIT(0), .links = mtl_712_only, @@ -739,6 +733,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[] = { .drv_name = "sof_sdw", .sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l23-rt714-l1.tplg", }, + { + .link_mask = 0x9, /* 2 active links required */ + .links = mtl_rt711_l0_rt1316_l3, + .drv_name = "sof_sdw", + .sof_tplg_filename = "sof-mtl-rt711-l0-rt1316-l3.tplg", + }, { .link_mask = BIT(0), .links = mtl_rt722_only,