ASoC: SOF: Intel: Use DMI oem string search for tgl_max98373_rt5682

DMI product name is used to support system variants based out of
tgl_max98373_rt5682 in current implementation. Replace this DMI search with
DMI_OEM_STRING. Coreboot(BIOS used in these systems) is
setting the needed DMI_OEM_STRING field to uniquely identify these
systems.

Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200910162705.2026036-1-kai.vehmanen@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 9a6f10e..ddbb9fe 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -123,7 +123,7 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
                .callback = sof_rt5682_quirk_cb,
                .matches = {
                        DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Volteer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Terrador"),
+                       DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98373_ALC5682I_I2S_UP4"),
                },
                .driver_data = (void *)(SOF_RT5682_MCLK_EN |
                                        SOF_RT5682_SSP_CODEC(0) |

diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index ec62d93..3ec3809 100644 (file)
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -50,7 +50,7 @@ static const struct dmi_system_id sof_tplg_table[] = {
                .callback = sof_tplg_cb,
                .matches = {
                        DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Volteer"),
-                       DMI_MATCH(DMI_PRODUCT_NAME, "Terrador"),
+                       DMI_MATCH(DMI_OEM_STRING, "AUDIO-MAX98373_ALC5682I_I2S_UP4"),
                },
                .driver_data = "sof-tgl-rt5682-ssp0-max98373-ssp2.tplg",
        },