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

ASoC: SOF: add path indirection to each IPC type 



With the addition of the IPCv4, we need the ability to select
different paths for firmware and topologies.

First add an indirection. Follow-up patches will add mechanisms to
select a default IPC or override it.

No functionality change in this patch.

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>
Link: https://lore.kernel.org/r/20220414184817.362215-3-pierre-louis.bossart@linux.intel.com


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

include/sound/sof.h

+2 −2
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ struct sof_dev_desc { 
	const char *nocodec_tplg_filename;



	/* defaults paths for firmware and topology files */

	const char *default_fw_path;

	const char *default_tplg_path;

	const char *default_fw_path[SOF_IPC_TYPE_COUNT];

	const char *default_tplg_path[SOF_IPC_TYPE_COUNT];



	/* default firmware name */

	const char *default_fw_filename;

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

+6 −2
Original line number Diff line number Diff line
@@ -54,8 +54,12 @@ static const struct sof_dev_desc renoir_desc = { 
	.resindex_imr_base	= -1,

	.irqindex_host_ipc	= -1,

	.chip_info		= &renoir_chip_info,

	.default_fw_path	= "amd/sof",

	.default_tplg_path	= "amd/sof-tplg",

	.default_fw_path = {

		[SOF_IPC] = "amd/sof",

	},

	.default_tplg_path = {

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

	},

	.default_fw_filename	= "sof-rn.ri",

	.nocodec_tplg_filename	= "sof-acp.tplg",

	.ops			= &sof_renoir_ops,

sound/soc/sof/imx/imx8.c

+12 −4
Original line number Diff line number Diff line
@@ -613,16 +613,24 @@ static const struct snd_sof_dsp_ops sof_imx8x_ops = { 
};



static struct sof_dev_desc sof_of_imx8qxp_desc = {

	.default_fw_path = "imx/sof",

	.default_tplg_path = "imx/sof-tplg",

	.default_fw_path = {

		[SOF_IPC] = "imx/sof",

	},

	.default_tplg_path = {

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

	},

	.default_fw_filename = "sof-imx8x.ri",

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

	.ops = &sof_imx8x_ops,

};



static struct sof_dev_desc sof_of_imx8qm_desc = {

	.default_fw_path = "imx/sof",

	.default_tplg_path = "imx/sof-tplg",

	.default_fw_path = {

		[SOF_IPC] = "imx/sof",

	},

	.default_tplg_path = {

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

	},

	.default_fw_filename = "sof-imx8.ri",

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

	.ops = &sof_imx8_ops,

sound/soc/sof/imx/imx8m.c

+6 −2
Original line number Diff line number Diff line
@@ -473,8 +473,12 @@ static const struct snd_sof_dsp_ops sof_imx8m_ops = { 
};



static struct sof_dev_desc sof_of_imx8mp_desc = {

	.default_fw_path = "imx/sof",

	.default_tplg_path = "imx/sof-tplg",

	.default_fw_path = {

		[SOF_IPC] = "imx/sof",

	},

	.default_tplg_path = {

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

	},

	.default_fw_filename = "sof-imx8m.ri",

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

	.ops = &sof_imx8m_ops,

sound/soc/sof/intel/bdw.c

+6 −2
Original line number Diff line number Diff line
@@ -646,8 +646,12 @@ static const struct sof_dev_desc sof_acpi_broadwell_desc = { 
	.resindex_imr_base = -1,

	.irqindex_host_ipc = 0,

	.chip_info = &bdw_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

	},

	.default_tplg_path = {

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

	},

	.default_fw_filename = "sof-bdw.ri",

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

	.ops = &sof_bdw_ops,