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

Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "rpl_rt5682_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/20240208165545.93811-5-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 e556bbd660c5666a66c06f7d3b0f7c2434cda6e9..995372091387874032ca9175decf74bbb64d4c79 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -856,16 +856,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_RT5682_NUM_HDMIDEV(4)),
        },
        {
-               .name = "rpl_mx98360_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 = "rpl_rt1019_rt5682",
+               .name = "rpl_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-rpl-match.c b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
index c0a643f4725aa9bd8fabb609aa6ae95b25a44a65..00a21af210fa43bef143fd3ae192e8a0c32a77b3 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-rpl-match.c
@@ -395,7 +395,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
        },
        {
                .comp_ids = &rpl_rt5682_hp,
-               .drv_name = "rpl_mx98360_rt5682",
+               .drv_name = "rpl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rpl_max98360a_amp,
                .sof_tplg_filename = "sof-rpl-max98360a-rt5682.tplg",
@@ -423,7 +423,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[] = {
        },
        {
                .comp_ids = &rpl_rt5682_hp,
-               .drv_name = "rpl_rt1019_rt5682",
+               .drv_name = "rpl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rpl_rt1019p_amp,
                .sof_tplg_filename = "sof-rpl-rt1019-rt5682.tplg",