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

Introduce "cml_rt5682_def" for cml boards which implement headphone
codec on SSP0 and speaker amplifiers on SSP1.

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://msgid.link/r/20240325221059.206042-22-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 f80fdbd8fdac5306b4eb78b790534a774170d81a..aadd341a202cc2ade118c9ecbb97ef06ae7ea075 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -722,7 +722,7 @@ static const struct platform_device_id board_ids[] = {
                .name = "sof_rt5682",
        },
        {
-               .name = "cml_rt1015_rt5682",
+               .name = "cml_rt5682_def",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
                                        SOF_SSP_PORT_CODEC(0) |
                                        SOF_SSP_PORT_AMP(1)),

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 5eab17820532ead4abc07f67d66f59a8a70cf924..d47a548959eaf843dd99636d4752369aa2108476 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -49,21 +49,21 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
        },
        {
                .id = "10EC5682",
-               .drv_name = "cml_rt1015_rt5682",
+               .drv_name = "cml_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt1015_spk_codecs,
                .sof_tplg_filename = "sof-cml-rt1011-rt5682.tplg",
        },
        {
                .id = "10EC5682",
-               .drv_name = "sof_rt5682",
+               .drv_name = "cml_rt5682_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &max98357a_spk_codecs,
                .sof_tplg_filename = "sof-cml-rt5682-max98357a.tplg",
        },
        {
                .id = "10EC5682",
-               .drv_name = "sof_rt5682",
+               .drv_name = "cml_rt5682_def",
                .sof_tplg_filename = "sof-cml-rt5682.tplg",
        },
        {