ASoC: Intel: sof_cs42l42: mach cleanup for adl boards

Add a common entry in enumeration table for all cs42l42 boards
with/without speaker amplifier. All other adl_cs42l42_def entries
become redundant so get removed.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240327162408.63953-17-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 7977a6fb9a5c8909acc39b7c64acdc72a5ee796b..1ea2d9c582ee1651faaac886eb9126bb36efeac0 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -495,13 +495,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .quirk_data = &adl_lt6911_hdmi,
                .sof_tplg_filename = "sof-adl-rt5682-ssp1-hdmi-ssp02.tplg",
        },
-       {
-               .id = "10134242",
-               .drv_name = "adl_cs42l42_def",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &adl_max98360a_amp,
-               .sof_tplg_filename = "sof-adl-max98360a-cs42l42.tplg",
-       },
        {
                .comp_ids = &essx_83x6,
                .drv_name = "adl_es83x6_c1_h02",
@@ -527,6 +520,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
        /* place boards for each headphone codec: sof driver will complete the
         * tplg name and machine driver will detect the amp type
         */
+       {
+               .id = CS42L42_ACPI_HID,
+               .drv_name = "adl_cs42l42_def",
+               .sof_tplg_filename = "sof-adl", /* the tplg suffix is added at run time */
+               .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
+                                       SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
+       },
        {
                .id = NAU8825_ACPI_HID,
                .drv_name = "adl_nau8825_def",