Unverified Commit a6264056 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: soc-acpi: remove sof_fw_filename 



We've been using a default firmware name for each PCI/ACPI/OF platform
for a while. The machine-specific sof_fw_filename is in practice not
different from the default, and newer devices don't set this field, so
let's remove the redundant definitions.

When OEMs modify the base firmware, they can keep the same firmware
name but store the file in a separate directory.

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220301194903.60859-2-pierre-louis.bossart@linux.intel.com


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

include/sound/soc-acpi.h

+0 −2
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ struct snd_soc_acpi_link_adr { 
 * audio codecs whose presence if checked with ACPI

 * @pdata: intended for platform data or machine specific-ops. This structure

 *  is not constant since this field may be updated at run-time

 * @sof_fw_filename: Sound Open Firmware file name, if enabled

 * @sof_tplg_filename: Sound Open Firmware topology file name, if enabled

 */

/* Descriptor for SST ASoC machine driver */
@@ -158,7 +157,6 @@ struct snd_soc_acpi_mach { 
	const void *quirk_data;

	void *pdata;

	struct snd_soc_acpi_mach_params mach_params;

	const char *sof_fw_filename;

	const char *sof_tplg_filename;

};

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

+0 −13
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_mx98373_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98373_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-max98373-rt5682.tplg",

	},

	{
@@ -398,7 +397,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_mx98357_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98357a_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",

	},

	{
@@ -406,7 +404,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_mx98360_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98360a_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-max98360a-rt5682.tplg",

	},

	{
@@ -414,7 +411,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_rt1019p_nau8825",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_rt1019p_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-rt1019-nau8825.tplg",

	},

	{
@@ -422,7 +418,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_max98373_nau8825",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98373_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-max98373-nau8825.tplg",

	},

	{
@@ -430,13 +425,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_mx98360a_nau8825",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98360a_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-mx98360a-nau8825.tplg",

	},

	{

		.id = "10508825",

		.drv_name = "sof_nau8825",

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-nau8825.tplg",

	},

	{
@@ -444,13 +437,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = { 
		.drv_name = "adl_max98390_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &adl_max98390_amp,

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-max98390-rt5682.tplg",

	},

	{

		.comp_ids = &adl_rt5682_rt5682s_hp,

		.drv_name = "adl_rt5682",

		.sof_fw_filename = "sof-adl.ri",

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

	},

	{},
@@ -481,21 +472,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { 
		.link_mask = 0xF, /* 4 active links required */

		.links = adl_sdw_rt711_link2_rt1316_link01_rt714_link3,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01-rt714-l3.tplg",

	},

	{

		.link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */

		.links = adl_sdw_rt1316_link2_rt714_link3,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg",

	},

	{

		.link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */

		.links = adl_sdw_rt1316_link12_rt714_link0,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-adl.ri",

		.sof_tplg_filename = "sof-adl-rt1316-l12-rt714-l0.tplg",

	},

	{
@@ -514,7 +502,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { 
		.link_mask = 0x5, /* rt5682 on link0 & 2xmax98373 on link 2 */

		.links = adl_chromebook_base,

		.drv_name = "sof_sdw",

		.sof_fw_filename = "sof-adl.ri",

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

	},

	{},

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

+0 −6
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = { 
		.id = "INT343A",

		.drv_name = "bxt_alc298s_i2s",

		.fw_filename = "intel/dsp_fw_bxtn.bin",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-rt298.tplg",

	},

	{
@@ -60,32 +59,27 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = { 
		.fw_filename = "intel/dsp_fw_bxtn.bin",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &bxt_codecs,

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-da7219.tplg",

	},

	{

		.id = "104C5122",

		.drv_name = "sof_pcm512x",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-pcm512x.tplg",

	},

	{

		.id = "1AEC8804",

		.drv_name = "sof-wm8804",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-wm8804.tplg",

	},

	{

		.id = "INT34C3",

		.drv_name = "bxt_tdf8532",

		.machine_quirk = apl_quirk,

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-tdf8532.tplg",

	},

	{

		.id = "ESSX8336",

		.drv_name = "sof-essx8336",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-es8336.tplg",

	},

	{},

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

+0 −11
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static struct snd_soc_acpi_mach byt_rt5672 = { 
	.drv_name = "cht-bsw-rt5672",

	.fw_filename = "intel/fw_sst_0f28.bin",

	.board = "cht-bsw",

	.sof_fw_filename = "sof-byt.ri",

	.sof_tplg_filename = "sof-byt-rt5670.tplg",

};
@@ -100,7 +99,6 @@ static struct snd_soc_acpi_mach byt_pov_p1006w = { 
	.drv_name = "bytcr_rt5651",

	.fw_filename = "intel/fw_sst_0f28.bin",

	.board = "bytcr_rt5651",

	.sof_fw_filename = "sof-byt.ri",

	.sof_tplg_filename = "sof-byt-rt5651.tplg",

};
@@ -147,7 +145,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcr_rt5640",

		.machine_quirk = byt_quirk,

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-rt5640.tplg",

	},

	{
@@ -155,7 +152,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.drv_name = "bytcr_rt5651",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcr_rt5651",

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-rt5651.tplg",

	},

	{
@@ -163,7 +159,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.drv_name = "bytcr_wm5102",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcr_wm5102",

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-wm5102.tplg",

	},

	{
@@ -171,7 +166,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.drv_name = "bytcht_da7213",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcht_da7213",

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-da7213.tplg",

	},

	{
@@ -179,13 +173,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.drv_name = "bytcht_es8316",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcht_es8316",

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-es8316.tplg",

	},

	{

		.id = "10EC5682",

		.drv_name = "sof_rt5682",

		.sof_fw_filename = "sof-byt.ri",

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

	},

	/* some Baytrail platforms rely on RT5645, use CHT machine driver */
@@ -194,7 +186,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.drv_name = "cht-bsw-rt5645",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-rt5645.tplg",

	},

	/* use CHT driver to Baytrail Chromebooks */
@@ -203,7 +194,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.drv_name = "cht-bsw-max98090",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-max98090.tplg",

	},

	{
@@ -211,7 +201,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_baytrail_machines[] = { 
		.drv_name = "bytcht_cx2072x",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcht_cx2072x",

		.sof_fw_filename = "sof-byt.ri",

		.sof_tplg_filename = "sof-byt-cx2072x.tplg",

	},

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)

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

+0 −12
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ static struct snd_soc_acpi_mach cht_surface_mach = { 
	.drv_name = "cht-bsw-rt5645",

	.fw_filename = "intel/fw_sst_22a8.bin",

	.board = "cht-bsw",

	.sof_fw_filename = "sof-cht.ri",

	.sof_tplg_filename = "sof-cht-rt5645.tplg",

};
@@ -79,7 +78,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "cht-bsw-rt5672",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5670.tplg",

	},

	{
@@ -87,7 +85,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "cht-bsw-rt5645",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5645.tplg",

	},

	{
@@ -95,7 +92,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "cht-bsw-max98090",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-max98090.tplg",

	},

	{
@@ -103,7 +99,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "cht-bsw-nau8824",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-nau8824.tplg",

	},

	{
@@ -111,7 +106,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "bytcht_da7213",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcht_da7213",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-da7213.tplg",

	},

	{
@@ -119,7 +113,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "bytcht_es8316",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcht_es8316",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-es8316.tplg",

	},

	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
@@ -129,13 +122,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcr_rt5640",

		.machine_quirk = cht_quirk,

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5640.tplg",

	},

	{

		.id = "10EC5682",

		.drv_name = "sof_rt5682",

		.sof_fw_filename = "sof-cht.ri",

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

	},

	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
@@ -144,7 +135,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "bytcr_rt5651",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcr_rt5651",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-rt5651.tplg",

	},

	{
@@ -152,13 +142,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cherrytrail_machines[] = { 
		.drv_name = "bytcht_cx2072x",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcht_cx2072x",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-cx2072x.tplg",

	},

	{

		.id = "104C5122",

		.drv_name = "sof_pcm512x",

		.sof_fw_filename = "sof-cht.ri",

		.sof_tplg_filename = "sof-cht-src-50khz-pcm512x.tplg",

	},