ASoC: Intel: sof_nau8825: mach cleanup for rpl boards

Add a common entry in enumeration table for all nau8825 boards
with/without speaker amplifier. All other rpl_nau8825_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-10-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 77c917897c8d1c2fc9f0c468509ac11b849cecaa..44be9077b4e085b5eaabf7b263e02d6bf1c3f1c1 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -7,6 +7,7 @@
 
 #include <sound/soc-acpi.h>
 #include <sound/soc-acpi-intel-match.h>
+#include <sound/soc-acpi-intel-ssp-common.h>
 
 static const struct snd_soc_acpi_endpoint single_endpoint = {
        .num = 0,
@@ -365,21 +366,11 @@ static const struct snd_soc_acpi_codecs rpl_max98360a_amp = {
        .codecs = {"MX98360A"},
 };
 
-static const struct snd_soc_acpi_codecs rpl_max98373_amp = {
-       .num_codecs = 1,
-       .codecs = {"MX98373"}
-};
-
 static const struct snd_soc_acpi_codecs rpl_lt6911_hdmi = {
        .num_codecs = 1,
        .codecs = {"INTC10B0"}
 };
 
-static const struct snd_soc_acpi_codecs rpl_nau8318_amp = {
-       .num_codecs = 1,
-       .codecs = {"NVTN2012"}
-};
-
 static const struct snd_soc_acpi_codecs rpl_rt1019p_amp = {
        .num_codecs = 1,
        .codecs = {"RTL1019"}
@@ -400,27 +391,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
                .quirk_data = &rpl_max98360a_amp,
                .sof_tplg_filename = "sof-rpl-max98360a-rt5682.tplg",
        },
-       {
-               .id = "10508825",
-               .drv_name = "rpl_nau8825_def",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &rpl_max98373_amp,
-               .sof_tplg_filename = "sof-rpl-max98373-nau8825.tplg",
-       },
-       {
-               .id = "10508825",
-               .drv_name = "rpl_nau8825_def",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &rpl_max98360a_amp,
-               .sof_tplg_filename = "sof-rpl-max98360a-nau8825.tplg",
-       },
-       {
-               .id = "10508825",
-               .drv_name = "rpl_nau8825_def",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &rpl_nau8318_amp,
-               .sof_tplg_filename = "sof-rpl-nau8318-nau8825.tplg",
-       },
        {
                .comp_ids = &rpl_rt5682_hp,
                .drv_name = "rpl_rt5682_def",
@@ -450,6 +420,17 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
                                        SND_SOC_ACPI_TPLG_INTEL_SSP_MSB |
                                        SND_SOC_ACPI_TPLG_INTEL_DMIC_NUMBER,
        },
+       /* place boards for each headphone codec: sof driver will complete the
+        * tplg name and machine driver will detect the amp type
+        */
+       {
+               .id = NAU8825_ACPI_HID,
+               .drv_name = "rpl_nau8825_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,
+       },
+       /* place amp-only boards in the end of table */
        {
                .id = "INTC10B0",
                .drv_name = "rpl_lt6911_hdmi_ssp",