ASoC: Intel: sof_rt5682: override tplg and quirk data for tgl_max98373_rt5682

sathya-nujella · sathya-nujella · commit 6e90d8f2c040 · 2020-08-05T15:00:16.000-07:00
Below changes are done in this patch:
1) A Chrome System based on tgl_max98373_rt5682 has different SSP and tplg
configurations. Using DMI data of this variant DUT, overiride
quirk and tplg information.

2) Machine driver's platform data has a copy of acpi mach data.
So, override tplg info on this platform data and use this tplg info
while loading tplg binary. Updated sof pcm.c accordingly.

Signed-off-by: Sathyanarayana Nujella &lt;sathyanarayana.nujella@intel.com&gt;
Signed-off-by: Mac Chiang &lt;mac.chiang@intel.com&gt;
diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
@@ -66,12 +66,29 @@ struct sof_card_private {
 	bool common_hdmi_codec_drv;
 };
 
+const char *sof_override_tplg_name;
+
 static int sof_rt5682_quirk_cb(const struct dmi_system_id *id)
 {
 	sof_rt5682_quirk = (unsigned long)id->driver_data;
 	return 1;
 }
-
+static int sof_rt5682_tplg_cb(const struct dmi_system_id *id)
+{
+	sof_override_tplg_name = (const char *)id->driver_data;
+	return 1;
+}
+static const struct dmi_system_id sof_rt5682_tplg_table[] = {
+	{
+		.callback = sof_rt5682_tplg_cb,
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Volteer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Terrador"),
+		},
+		.driver_data = (void *)("sof-tgl-max98373-rt5682-ssp2.tplg"),
+	},
+	{}
+};
 static const struct dmi_system_id sof_rt5682_quirk_table[] = {
 	{
 		.callback = sof_rt5682_quirk_cb,
@@ -119,6 +136,19 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = {
 		.driver_data = (void *)(SOF_RT5682_MCLK_EN |
 					SOF_RT5682_SSP_CODEC(0)),
 	},
+	{
+		.callback = sof_rt5682_quirk_cb,
+		.matches = {
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "Google_Volteer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Terrador"),
+		},
+		.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)),
+	},
 	{}
 };
 
@@ -734,6 +764,11 @@ static int sof_audio_probe(struct platform_device *pdev)
 
 	mach = pdev->dev.platform_data;
 
+	dmi_check_system(sof_rt5682_tplg_table);
+
+	if (sof_override_tplg_name)
+		mach->sof_tplg_filename = sof_override_tplg_name;
+
 	/* A speaker amp might not be present when the quirk claims one is.
 	 * Detect this via whether the machine driver match includes quirk_data.
 	 */
diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
@@ -756,6 +756,12 @@ static int sof_pcm_probe(struct snd_soc_component *component)
 	struct snd_sof_pdata *plat_data = sdev->pdata;
 	const char *tplg_filename;
 	int ret;
+	struct platform_device *pdev = plat_data->pdev_mach;
+	struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
+
+	/* Machine drivers may override tplg file name */
+	if (mach)
+		plat_data->tplg_filename = mach->sof_tplg_filename;
 
 	/* load the default topology */
 	sdev->component = component;
