ASoC: Intel: sof_rt5682: add icl_rt5682_def for icl boards

Add the board config icl_rt5682_def to rt5682 machine driver for all
icl boards using default SSP port allocation (headphone codec on SSP0).

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/20240426152529.38345-20-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 4c6dfe632edfcb255f1152f56282031af8a06282..7a35db5cab35a202b73c05b66ed043007dc12031 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -76,15 +76,6 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
                                        SOF_SSP_PORT_CODEC(0) |
                                        SOF_SSP_PORT_AMP(1)),
        },
-       {
-               .callback = sof_rt5682_quirk_cb,
-               .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Ice Lake Client"),
-               },
-               .driver_data = (void *)(SOF_RT5682_MCLK_EN |
-                                       SOF_SSP_PORT_CODEC(0)),
-       },
        {
                .callback = sof_rt5682_quirk_cb,
                .matches = {
@@ -808,6 +799,11 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_SSP_PORT_CODEC(2) |
                                        SOF_SSP_PORT_AMP(1)),
        },
+       {
+               .name = "icl_rt5682_def",
+               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
+                                       SOF_SSP_PORT_CODEC(0)),
+       },
        {
                .name = "cml_rt5682_def",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
index d0062f2cd256690a71cab259fd29b69f727f631b..39875d67dcd1d3b48a64c5db96c580fedfc53e12 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -29,7 +29,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = {
        },
        {
                .id = "10EC5682",
-               .drv_name = "sof_rt5682",
+               .drv_name = "icl_rt5682_def",
                .sof_tplg_filename = "sof-icl-rt5682.tplg",
        },
        {