ASoC: Intel: sof_cs42l42: board id cleanup for adl boards

Introduce "adl_cs42l42_def" for adl 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/20240327162408.63953-16-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_cs42l42.c b/sound/soc/intel/boards/sof_cs42l42.c
index 40ecfeaa1d26362aa5073d4b76b4afa406bea4fd..8a2833a0e3c52f88786ab721260dea209457df59 100644 (file)
--- a/sound/soc/intel/boards/sof_cs42l42.c
+++ b/sound/soc/intel/boards/sof_cs42l42.c
@@ -263,7 +263,7 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_SSP_PORT_AMP(1)),
        },
        {
-               .name = "adl_mx98360a_cs4242",
+               .name = "adl_cs42l42_def",
                .driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(0) |
                                        SOF_SSP_PORT_AMP(1) |
                                        SOF_NUM_IDISP_HDMI(4) |

diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 9ac9310dd2be6882243dc880778aa4ac12d952bb..7977a6fb9a5c8909acc39b7c64acdc72a5ee796b 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -497,7 +497,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
        },
        {
                .id = "10134242",
-               .drv_name = "adl_mx98360a_cs4242",
+               .drv_name = "adl_cs42l42_def",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98360a_amp,
                .sof_tplg_filename = "sof-adl-max98360a-cs42l42.tplg",