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

Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "tgl_rt5682_def" board to reduce
the number of tgl 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-3-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 3763985f570fcf0c308fe63b56c72def433a0fd5..9644ae22c6eed30963879421c35bc7fff9efd858 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -816,25 +816,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_RT5682_SSP_AMP(1)),
        },
        {
-               .name = "tgl_mx98357_rt5682",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682_SSP_AMP(1) |
-                                       SOF_RT5682_NUM_HDMIDEV(4) |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
-       {
-               .name = "tgl_rt1011_rt5682",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682_SSP_AMP(1) |
-                                       SOF_RT5682_NUM_HDMIDEV(4) |
-                                       SOF_BT_OFFLOAD_SSP(2) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT),
-       },
-       {
-               .name = "tgl_mx98373_rt5682",
+               .name = "tgl_rt5682_def",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
                                        SOF_RT5682_SSP_CODEC(0) |
                                        SOF_RT5682_SSP_AMP(1) |

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index e5f721ba5ed478cdb108cc7be1564566aa53bb0a..0fba0a60d9c79361c5fb6856458224e21f5eb4c4 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -495,21 +495,21 @@ static const struct snd_soc_acpi_codecs tgl_lt6911_hdmi = {
 struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
        {
                .comp_ids = &tgl_rt5682_rt5682s_hp,
-               .drv_name = "tgl_mx98357_rt5682",
+               .drv_name = "tgl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_codecs,
                .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg",
        },
        {
                .comp_ids = &tgl_rt5682_rt5682s_hp,
-               .drv_name = "tgl_mx98373_rt5682",
+               .drv_name = "tgl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_max98373_amp,
                .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg",
        },
        {
                .comp_ids = &tgl_rt5682_rt5682s_hp,
-               .drv_name = "tgl_rt1011_rt5682",
+               .drv_name = "tgl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_rt1011_amp,
                .sof_tplg_filename = "sof-tgl-rt1011-rt5682.tplg",