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

ASoC: SOF: add default IPC capability and file paths 



This patch adds a default IPC type for each platform, along with file
paths to be used for each IPC type. To make reviews simpler, we only
modify platform descriptors in this table, the information will be
used in the next patch.

The Intel IPCv4 is only supported on Intel platforms after APL, and
not by default. In follow-up patches, support for SKL and KBL will be
added, and in those two cases the IPCv4 will be the default (and only
supported mode).

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-4-pierre-louis.bossart@linux.intel.com


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

include/sound/sof.h

+4 −0
Original line number Diff line number Diff line
@@ -124,6 +124,10 @@ struct sof_dev_desc { 
	/* defaults for no codec mode */

	const char *nocodec_tplg_filename;



	/* information on supported IPCs */

	unsigned int ipc_supported_mask;

	enum sof_ipc_type ipc_default;



	/* defaults paths for firmware and topology files */

	const char *default_fw_path[SOF_IPC_TYPE_COUNT];

	const char *default_tplg_path[SOF_IPC_TYPE_COUNT];

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

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

	.irqindex_host_ipc	= -1,

	.chip_info		= &renoir_chip_info,

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.default_fw_path = {

		[SOF_IPC] = "amd/sof",

	},

sound/soc/sof/imx/imx8.c

+4 −0
Original line number Diff line number Diff line
@@ -613,6 +613,8 @@ static const struct snd_sof_dsp_ops sof_imx8x_ops = { 
};



static struct sof_dev_desc sof_of_imx8qxp_desc = {

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.default_fw_path = {

		[SOF_IPC] = "imx/sof",

	},
@@ -625,6 +627,8 @@ static struct sof_dev_desc sof_of_imx8qxp_desc = { 
};



static struct sof_dev_desc sof_of_imx8qm_desc = {

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.default_fw_path = {

		[SOF_IPC] = "imx/sof",

	},

sound/soc/sof/imx/imx8m.c

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



static struct sof_dev_desc sof_of_imx8mp_desc = {

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.default_fw_path = {

		[SOF_IPC] = "imx/sof",

	},

sound/soc/sof/intel/bdw.c

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

	.irqindex_host_ipc = 0,

	.chip_info = &bdw_chip_info,

	.ipc_supported_mask = BIT(SOF_IPC),

	.ipc_default = SOF_IPC,

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

	},