Unverified Commit 46fa9a15 authored by jairaj arava's avatar jairaj arava Committed by Mark Brown
Browse files

ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant 



DMI product name is used to support system variants based on
adl_mx98373_rt5682 in current implementation. Replace this DMI search with
DMI_OEM_STRING and coreboot(BIOS used in these systems) is
setting the needed DMI_OEM_STRING field to uniquely identify these
systems.

Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Signed-off-by: default avatarjairaj arava <jairaj.arava@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210802152151.15832-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b8cab69b

sound/soc/intel/boards/sof_rt5682.c

+14 −0
Original line number Diff line number Diff line
@@ -162,6 +162,20 @@ 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_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Alder Lake Client Platform"),

			DMI_MATCH(DMI_OEM_STRING, "AUDIO-ADL_MAX98373_ALC5682I_I2S"),

		},

		.driver_data = (void *)(SOF_RT5682_MCLK_EN |

					SOF_RT5682_SSP_CODEC(0) |

					SOF_SPEAKER_AMP_PRESENT |

					SOF_MAX98373_SPEAKER_AMP_PRESENT |

					SOF_RT5682_SSP_AMP(2) |

					SOF_RT5682_NUM_HDMIDEV(4)),

	},

	{}

};

sound/soc/sof/sof-pci-dev.c

+9 −0
Original line number Diff line number Diff line
@@ -50,6 +50,15 @@ static const struct dmi_system_id sof_tplg_table[] = { 
		},

		.driver_data = "sof-tgl-rt5682-ssp0-max98373-ssp2.tplg",

	},

	{

		.callback = sof_tplg_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Alder Lake Client Platform"),

			DMI_MATCH(DMI_OEM_STRING, "AUDIO-ADL_MAX98373_ALC5682I_I2S"),

		},

		.driver_data = "sof-adl-rt5682-ssp0-max98373-ssp2.tplg",

	},

	{}

};