ASoC: Intel: sof_rt5682: dmi quirk cleanup for mtl boards

Some dmi quirks are duplicated since codec and amplifier type are
removed from board quirk. Remove redundant quirks.

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-7-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 fc25820..640d17c 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -154,46 +154,6 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
                                        SOF_RT5682_SSP_AMP(2) |
                                        SOF_RT5682_NUM_HDMIDEV(4)),
        },
-       {
-               .callback = sof_rt5682_quirk_cb,
-               .matches = {
-                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"),
-                       DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_I2S"),
-               },
-               .driver_data = (void *)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(2) |
-                                       SOF_RT5682_SSP_AMP(0) |
-                                       SOF_RT5682_NUM_HDMIDEV(3) |
-                                       SOF_BT_OFFLOAD_SSP(1) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT
-                                       ),
-       },
-       {
-               .callback = sof_rt5682_quirk_cb,
-               .matches = {
-                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"),
-                       DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98360_ALC5682I_DISCRETE_I2S_BT"),
-               },
-               .driver_data = (void *)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(2) |
-                                       SOF_RT5682_SSP_AMP(0) |
-                                       SOF_RT5682_NUM_HDMIDEV(3) |
-                                       SOF_BT_OFFLOAD_SSP(1) |
-                                       SOF_SSP_BT_OFFLOAD_PRESENT
-                                       ),
-       },
-       {
-               .callback = sof_rt5682_quirk_cb,
-               .matches = {
-                       DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Rex"),
-                       DMI_MATCH(DMI_OEM_STRING, "AUDIO-ALC1019_ALC5682I_I2S"),
-               },
-               .driver_data = (void *)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_SSP_CODEC(2) |
-                                       SOF_RT5682_SSP_AMP(0) |
-                                       SOF_RT5682_NUM_HDMIDEV(3)
-                                       ),
-       },
        {
                .callback = sof_rt5682_quirk_cb,
                .matches = {