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

Many board configs are duplicated since codec and amplifier type are
removed from board quirk. Introduce "jsl_rt5682_def" board to reduce
the number of jsl 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-2-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 cd50f26d1edbedbc10074c472a3479114a823656..3763985f570fcf0c308fe63b56c72def433a0fd5 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -810,30 +810,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_RT5682_SSP_AMP(1)),
        },
        {
-               .name = "jsl_rt5682_rt1015",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682_SSP_AMP(1)),
-       },
-       {
-               .name = "jsl_rt5682_mx98360",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682_SSP_AMP(1)),
-       },
-       {
-               .name = "jsl_rt5682_rt1015p",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682_SSP_AMP(1)),
-       },
-       {
-               .name = "jsl_rt5682",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(0)),
-       },
-       {
-               .name = "jsl_rt5650",
+               .name = "jsl_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-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index 342bbbb48ca7e4b93dbec3bdba491923cc9f4cfc..a6ac2525df175ead327ac987f3f5ab7e129ba19a 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -66,28 +66,28 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        },
        {
                .comp_ids = &rt5682_rt5682s_hp,
-               .drv_name = "jsl_rt5682_rt1015",
+               .drv_name = "jsl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt1015_spk,
                .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
        },
        {
                .comp_ids = &rt5682_rt5682s_hp,
-               .drv_name = "jsl_rt5682_rt1015p",
+               .drv_name = "jsl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt1015p_spk,
                .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
        },
        {
                .comp_ids = &rt5682_rt5682s_hp,
-               .drv_name = "jsl_rt5682_mx98360",
+               .drv_name = "jsl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mx98360a_spk,
                .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg",
        },
        {
                .comp_ids = &rt5682_rt5682s_hp,
-               .drv_name = "jsl_rt5682",
+               .drv_name = "jsl_rt5682_def",
                .sof_tplg_filename = "sof-jsl-rt5682.tplg",
        },
        {
@@ -107,7 +107,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        },
        {
                .id = "10EC5650",
-               .drv_name = "jsl_rt5650",
+               .drv_name = "jsl_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt5650_spk,
                .sof_tplg_filename = "sof-jsl-rt5650.tplg",