ASoC: Intel: sof_da7219: mach cleanup for adl boards

Add a common entry in enumeration table for all da7219 boards
with/without speaker amplifier. All other adl_da7219_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://lore.kernel.org/r/20240411220347.131267-7-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 1ea2d9c582ee1651faaac886eb9126bb36efeac0..4167b2e9bc6a70dd0acd055d332c834ef1a8daa1 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -453,11 +453,6 @@ static const struct snd_soc_acpi_codecs adl_max98357a_amp = {
        .codecs = {"MX98357A"}
 };
 
-static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
-       .num_codecs = 1,
-       .codecs = {"MX98360A"}
-};
-
 static const struct snd_soc_acpi_codecs adl_rt5682_rt5682s_hp = {
        .num_codecs = 2,
        .codecs = {RT5682_ACPI_HID, RT5682S_ACPI_HID},
@@ -510,13 +505,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                                        SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |
                                        SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,
        },
-       {
-               .id = "DLGS7219",
-               .drv_name = "adl_da7219_def",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &adl_max98360a_amp,
-               .sof_tplg_filename = "sof-adl-max98360a-da7219.tplg",
-       },
        /* place boards for each headphone codec: sof driver will complete the
         * tplg name and machine driver will detect the amp type
         */
@@ -527,6 +515,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
                                        SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
        },
+       {
+               .id = DA7219_ACPI_HID,
+               .drv_name = "adl_da7219_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",