ASoC: Intel: soc-acpi: arl: Correct order of cs42l43 matches
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Thu, 26 Jun 2025 14:18:41 +0000 (15:18 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 29 Jun 2025 21:10:28 +0000 (22:10 +0100)
Matches should go from more specific to less specific, correct the
ordering of two cs42l43 entries.

Fixes: c0524067653d ("ASoC: Intel: soc-acpi: arl: Add match entries for new cs42l43 laptops")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250626141841.77780-1-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/common/soc-acpi-intel-arl-match.c

index 73e581e937554ed4228e67becd8b654ae03b4bbf..1ad704ca2c5f2bc4c1a79e0794244627ef2ed8bd 100644 (file)
@@ -468,17 +468,17 @@ 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(2) | BIT(3),
+               .links = arl_cs42l43_l2_cs35l56_l3,
                .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
+               .sof_tplg_filename = "sof-arl-cs42l43-l2-cs35l56-l3.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
        {
-               .link_mask = BIT(2) | BIT(3),
-               .links = arl_cs42l43_l2_cs35l56_l3,
+               .link_mask = BIT(2),
+               .links = arl_cs42l43_l2,
                .drv_name = "sof_sdw",
-               .sof_tplg_filename = "sof-arl-cs42l43-l2-cs35l56-l3.tplg",
+               .sof_tplg_filename = "sof-arl-cs42l43-l2.tplg",
                .get_function_tplg_files = sof_sdw_get_tplg_files,
        },
        {