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

Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "rpl_nau8825_def" board to reduce
the number of rpl 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-3-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 eb3813400593c49cc3f3ba4db99c4e5d9377a7ac..719c2fbaf515a91047f9386452a3be32d7ff87b0 100644 (file)
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -361,23 +361,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_SSP_BT_OFFLOAD_PRESENT),
        },
        {
-               .name = "rpl_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),
-       },
-       {
-               .name = "rpl_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 = "rpl_nau8318_8825",
+               .name = "rpl_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-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
index 5b6f57e3a583920d156ce7bba20e5af1c4a53e30..c0a643f4725aa9bd8fabb609aa6ae95b25a44a65 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -402,21 +402,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
        },
        {
                .id = "10508825",
-               .drv_name = "rpl_max98373_8825",
+               .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_mx98360a_8825",
+               .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_nau8318_8825",
+               .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",