ASoC: Intel: sof_rt5682: board id cleanup for mtl boards

Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "mtl_rt5682_def" board to reduce
the number of mtl 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/20240208165545.93811-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 995372091387874032ca9175decf74bbb64d4c79..fc2582045598cb5e9dea6ce17958e1e5e82c1f60 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -889,14 +889,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_RT5682_NUM_HDMIDEV(3)),
        },
        {
-               .name = "mtl_rt1019_rt5682",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(2) |
-                                       SOF_RT5682_SSP_AMP(0) |
-                                       SOF_RT5682_NUM_HDMIDEV(3)),
-       },
-       {
-               .name = "mtl_rt5650",
+               .name = "mtl_rt5682_def",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
                                        SOF_RT5682_SSP_CODEC(2) |
                                        SOF_RT5682_SSP_AMP(0) |

diff --git a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
index 23eaf47b3f24a4f58700017ab9a9a0ae35277214..e9a5da0790890910273f49f7021db5efd1746284 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-mtl-match.c
@@ -62,7 +62,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
        },
        {
                .comp_ids = &mtl_rt5682_rt5682s_hp,
-               .drv_name = "mtl_rt1019_rt5682",
+               .drv_name = "mtl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mtl_rt1019p_amp,
                .sof_tplg_filename = "sof-mtl-rt1019-rt5682.tplg",
@@ -84,7 +84,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {
        },
        {
                .id = "10EC5650",
-               .drv_name = "mtl_rt5650",
+               .drv_name = "mtl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mtl_rt5650_amp,
                .sof_tplg_filename = "sof-mtl-rt5650.tplg",