ASoC: Intel: sof_da7219: mach cleanup for rpl boards

Add a common entry in enumeration table for all da7219 boards
with/without speaker amplifier. All other rpl_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-8-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
index 34588db6138af4832d1c324e031895287ef0f458..b0a49e28ab0926857e558a32d1d7e04728fc3ba0 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -361,11 +361,6 @@ static const struct snd_soc_acpi_codecs rpl_max98357a_amp = {
        .codecs = {"MX98357A"}
 };
 
-static const struct snd_soc_acpi_codecs rpl_max98360a_amp = {
-       .num_codecs = 1,
-       .codecs = {"MX98360A"},
-};
-
 static const struct snd_soc_acpi_codecs rpl_lt6911_hdmi = {
        .num_codecs = 1,
        .codecs = {"INTC10B0"}
@@ -411,6 +406,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
                .tplg_quirk_mask = SND_SOC_ACPI_TPLG_INTEL_AMP_NAME |
                                        SND_SOC_ACPI_TPLG_INTEL_CODEC_NAME,
        },
+       {
+               .id = DA7219_ACPI_HID,
+               .drv_name = "rpl_da7219_def",
+               .sof_tplg_filename = "sof-rpl", /* 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 = "rpl_nau8825_def",
@@ -438,13 +440,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
                .drv_name = "rpl_lt6911_hdmi_ssp",
                .sof_tplg_filename = "sof-rpl-nocodec-hdmi-ssp02.tplg"
        },
-       {
-               .id = "DLGS7219",
-               .drv_name = "rpl_da7219_def",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &rpl_max98360a_amp,
-               .sof_tplg_filename = "sof-rpl-max98360a-da7219.tplg",
-       },
        {},
 };
 EXPORT_SYMBOL_GPL(snd_soc_acpi_intel_rpl_machines);