Unverified Commit 3d149325 authored by Libin Yang's avatar Libin Yang Committed by Mark Brown
Browse files

ASoC: Intel: tgl: remove sof_fw_filename set for tgl_3_in_1_default 



tgl_3_in_1_default link topology may be used by both TGL-LP and TGL-H.
Let's remove the sof_fw_filename setting in struct snd_soc_acpi_mach
and use the default_fw_filename setting in struct sof_dev_desc.

Signed-off-by: default avatarLibin Yang <libin.yang@intel.com>
Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Tested-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20210125070500.807474-2-kai.vehmanen@linux.intel.com


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

sound/soc/intel/common/soc-acpi-intel-tgl-match.c

+0 −7
Original line number Diff line number Diff line
@@ -358,14 +358,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = { 
		.link_mask = 0x7,

		.links = tgl_sdw_rt711_link1_rt1308_link2_rt715_link0,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-tgl.ri",

		.sof_tplg_filename = "sof-tgl-rt715-rt711-rt1308-mono.tplg",

	},

	{

		.link_mask = 0xF, /* 4 active links required */

		.links = tgl_3_in_1_default,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-tgl.ri",

		.sof_tplg_filename = "sof-tgl-rt711-rt1308-rt715.tplg",

	},

	{
@@ -377,35 +375,30 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = { 
		.link_mask = 0xF,

		.links = tgl_3_in_1_mono_amp,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-tgl.ri",

		.sof_tplg_filename = "sof-tgl-rt711-rt1308-mono-rt715.tplg",

	},

	{

		.link_mask = 0xF, /* 4 active links required */

		.links = tgl_3_in_1_sdca,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-tgl.ri",

		.sof_tplg_filename = "sof-tgl-rt711-rt1316-rt714.tplg",

	},

	{

		.link_mask = 0x3, /* rt711 on link 0 and 2 rt1308s on link 1 */

		.links = tgl_rvp,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-tgl.ri",

		.sof_tplg_filename = "sof-tgl-rt711-rt1308.tplg",

	},

	{

		.link_mask = 0x3, /* rt5682 on link0 & 2xmax98373 on link 1 */

		.links = tgl_chromebook_base,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-tgl.ri",

		.sof_tplg_filename = "sof-tgl-sdw-max98373-rt5682.tplg",

	},

	{

		.link_mask = 0x1, /* this will only enable rt5682 for now */

		.links = tgl_chromebook_base,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-tgl.ri",

		.sof_tplg_filename = "sof-tgl-rt5682.tplg",

	},

	{},