Chrome DUT based on tgl_max98373_rt5682: override tplg and quirk data

[sathya-nujella]

Chrome DUT based on tgl_max98373_rt5682: override tplg and quirk data

Below changes are done here:

1)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.

2. 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.

[ranj063]

@dbaluta how would this change affect you?

[plbossart]

The change looks ok, but the topology names doesn't seem so good. I'd really like us to follow the previous convention with rt5682 first followed by the amplifier name.

[plbossart]

LGTM, but can you also send a PR to change the topology names for rt5682-max98373 in sound/soc/intel/common and also in SOF tools/topology/CMakefile

Thanks @sathya-nujella

[plbossart]

SOFCI TEST

[plbossart]

@sathya-nujella I was talking about a simple change like this:

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 6816847bee40..355a6d8ac175 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c@@ -261,19 +261,19 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
},
{
.id = "10EC5682",
- .drv_name = "tgl_max98357a_rt5682",+ .drv_name = "tgl_rt5682_max98357a",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &tgl_codecs,
.sof_fw_filename = "sof-tgl.ri",
- .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg",+ .sof_tplg_filename = "sof-tgl-rt5682-max98357a.tplg",
},
{
.id = "10EC5682",
- .drv_name = "tgl_max98373_rt5682",+ .drv_name = "tgl_rt5682_max98373",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &tgl_max98373_amp,
.sof_fw_filename = "sof-tgl.ri",
- .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg",+ .sof_tplg_filename = "sof-tgl-rt5682-max98373.tplg",
},
{},
};
@@ -319,7 +319,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
.links = tgl_chromebook_base,
.drv_name = "sof_sdw",
.sof_fw_filename = "sof-tgl.ri",
- .sof_tplg_filename = "sof-tgl-sdw-max98373-rt5682.tplg",+ .sof_tplg_filename = "sof-tgl-sdw-rt5682-max98373.tplg",
},
{
.link_mask = 0x1, /* this will only enable rt5682 for now */

[sathya-nujella]

LGTM, but can you also send a PR to change the topology names for rt5682-max98373 in sound/soc/intel/common and also in SOF tools/topology/CMakefile

Thanks @sathya-nujella

sure @plbossart , I will do.

[sathya-nujella]

@sathya-nujella I was talking about a simple change like this:

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 6816847bee40..355a6d8ac175 100644
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c@@ -261,19 +261,19 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
},
{
.id = "10EC5682",
- .drv_name = "tgl_max98357a_rt5682",+ .drv_name = "tgl_rt5682_max98357a",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &tgl_codecs,
.sof_fw_filename = "sof-tgl.ri",
- .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg",+ .sof_tplg_filename = "sof-tgl-rt5682-max98357a.tplg",
},
{
.id = "10EC5682",
- .drv_name = "tgl_max98373_rt5682",+ .drv_name = "tgl_rt5682_max98373",
.machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &tgl_max98373_amp,
.sof_fw_filename = "sof-tgl.ri",
- .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg",+ .sof_tplg_filename = "sof-tgl-rt5682-max98373.tplg",
},
{},
};
@@ -319,7 +319,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
.links = tgl_chromebook_base,
.drv_name = "sof_sdw",
.sof_fw_filename = "sof-tgl.ri",
- .sof_tplg_filename = "sof-tgl-sdw-max98373-rt5682.tplg",+ .sof_tplg_filename = "sof-tgl-sdw-rt5682-max98373.tplg",
},
{
.link_mask = 0x1, /* this will only enable rt5682 for now */

Sure @plbossart , understood. I will do in a separate PR. Thanks!

[sathya-nujella]

rebased on top of latest sof-dev

[lyakh]

sorry, I should have noticed these before :-(

[sathya-nujella]

sorry, I should have noticed these before :-(

np thank you for inputs.

[lyakh]

Thanks for addressing the comments!