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

ASoC: SOF: add IPC-dependent file names 



To avoid misleading file names, use different names for INTEL_IPC4
firmware files.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
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>
Reviewed-by: default avatarChao Song <chao.song@intel.com>
Link: https://lore.kernel.org/r/20220414184817.362215-5-pierre-louis.bossart@linux.intel.com


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

include/sound/sof.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ struct sof_dev_desc { 
	const char *default_tplg_path[SOF_IPC_TYPE_COUNT];



	/* default firmware name */

	const char *default_fw_filename;

	const char *default_fw_filename[SOF_IPC_TYPE_COUNT];



	const struct snd_sof_dsp_ops *ops;

};

sound/soc/sof/amd/pci-rn.c

+3 −1
Original line number Diff line number Diff line
@@ -62,7 +62,9 @@ static const struct sof_dev_desc renoir_desc = { 
	.default_tplg_path = {

		[SOF_IPC] = "amd/sof-tplg",

	},

	.default_fw_filename	= "sof-rn.ri",

	.default_fw_filename	= {

		[SOF_IPC] = "sof-rn.ri",

	},

	.nocodec_tplg_filename	= "sof-acp.tplg",

	.ops			= &sof_renoir_ops,

};

sound/soc/sof/imx/imx8.c

+6 −2
Original line number Diff line number Diff line
@@ -621,7 +621,9 @@ static struct sof_dev_desc sof_of_imx8qxp_desc = { 
	.default_tplg_path = {

		[SOF_IPC] = "imx/sof-tplg",

	},

	.default_fw_filename = "sof-imx8x.ri",

	.default_fw_filename = {

		[SOF_IPC] = "sof-imx8x.ri",

	},

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8x_ops,

};
@@ -635,7 +637,9 @@ static struct sof_dev_desc sof_of_imx8qm_desc = { 
	.default_tplg_path = {

		[SOF_IPC] = "imx/sof-tplg",

	},

	.default_fw_filename = "sof-imx8.ri",

	.default_fw_filename = {

		[SOF_IPC] = "sof-imx8.ri",

	},

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8_ops,

};

sound/soc/sof/imx/imx8m.c

+3 −1
Original line number Diff line number Diff line
@@ -481,7 +481,9 @@ static struct sof_dev_desc sof_of_imx8mp_desc = { 
	.default_tplg_path = {

		[SOF_IPC] = "imx/sof-tplg",

	},

	.default_fw_filename = "sof-imx8m.ri",

	.default_fw_filename = {

		[SOF_IPC] = "sof-imx8m.ri",

	},

	.nocodec_tplg_filename = "sof-imx8-nocodec.tplg",

	.ops = &sof_imx8m_ops,

};

sound/soc/sof/intel/bdw.c

+3 −1
Original line number Diff line number Diff line
@@ -654,7 +654,9 @@ static const struct sof_dev_desc sof_acpi_broadwell_desc = { 
	.default_tplg_path = {

		[SOF_IPC] = "intel/sof-tplg",

	},

	.default_fw_filename = "sof-bdw.ri",

	.default_fw_filename = {

		[SOF_IPC] = "sof-bdw.ri",

	},

	.nocodec_tplg_filename = "sof-bdw-nocodec.tplg",

	.ops = &sof_bdw_ops,

};