ASoC: Intel: sof_nau8825: board id cleanup for adl boards

Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "adl_nau8825_def" board to reduce
the number of adl board configs.

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/20231204214200.203100-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
index 15ea6732ff9457879aef5151d86f96d717c8b729..eb3813400593c49cc3f3ba4db99c4e5d9377a7ac 100644 (file)
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -353,33 +353,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_NAU8825_NUM_HDMIDEV(4)),
        },
        {
-               .name = "adl_max98373_8825",
-               .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
-                                       SOF_NAU8825_SSP_AMP(1) |
-                                       SOF_NAU8825_NUM_HDMIDEV(4) |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
-       {
-               /* The limitation of length of char array, shorten the name */
-               .name = "adl_mx98360a_8825",
-               .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
-                                       SOF_NAU8825_SSP_AMP(1) |
-                                       SOF_NAU8825_NUM_HDMIDEV(4) |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-
-       },
-       {
-               .name = "adl_rt1015p_8825",
-               .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
-                                       SOF_NAU8825_SSP_AMP(1) |
-                                       SOF_NAU8825_NUM_HDMIDEV(4) |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
-       {
-               .name = "adl_nau8318_8825",
+               .name = "adl_nau8825_def",
                .driver_data = (kernel_ulong_t)(SOF_NAU8825_SSP_CODEC(0) |
                                        SOF_NAU8825_SSP_AMP(1) |
                                        SOF_NAU8825_NUM_HDMIDEV(4) |

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 6e712ad954c84998b2a69eb4da517009b7fd69a9..d3d913458c607f20b7349679ab5807d26194226d 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -528,14 +528,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
        },
        {
                .id = "10508825",
-               .drv_name = "adl_max98373_8825",
+               .drv_name = "adl_nau8825_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98373_amp,
                .sof_tplg_filename = "sof-adl-max98373-nau8825.tplg",
        },
        {
                .id = "10508825",
-               .drv_name = "adl_mx98360a_8825",
+               .drv_name = "adl_nau8825_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98360a_amp,
                .sof_tplg_filename = "sof-adl-max98360a-nau8825.tplg",
@@ -549,14 +549,14 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
        },
        {
                .id = "10508825",
-               .drv_name = "adl_rt1015p_8825",
+               .drv_name = "adl_nau8825_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_rt1015p_amp,
                .sof_tplg_filename = "sof-adl-rt1015-nau8825.tplg",
        },
        {
                .id = "10508825",
-               .drv_name = "adl_nau8318_8825",
+               .drv_name = "adl_nau8825_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_nau8318_amp,
                .sof_tplg_filename = "sof-adl-nau8318-nau8825.tplg",