Unverified Commit 0f7e753f authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: SOF: mediatek: Use generic names for IPC types 



Use the new SOF_IPC_TYPE_3 in core code.

No functional changes, just renaming.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230919104226.32239-9-peter.ujfalusi@linux.intel.com


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

sound/soc/sof/mediatek/mt8186/mt8186.c

+10 −10
Original line number Diff line number Diff line
@@ -607,16 +607,16 @@ static struct snd_sof_of_mach sof_mt8186_machs[] = { 


static const struct sof_dev_desc sof_of_mt8186_desc = {

	.of_machines = sof_mt8186_machs,

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.ipc_supported_mask	= BIT(SOF_IPC_TYPE_3),

	.ipc_default		= SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC] = "mediatek/sof",

		[SOF_IPC_TYPE_3] = "mediatek/sof",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_3] = "mediatek/sof-tplg",

	},

	.default_fw_filename = {

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

		[SOF_IPC_TYPE_3] = "sof-mt8186.ri",

	},

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

	.ops = &sof_mt8186_ops,
@@ -681,16 +681,16 @@ static struct snd_sof_of_mach sof_mt8188_machs[] = { 


static const struct sof_dev_desc sof_of_mt8188_desc = {

	.of_machines = sof_mt8188_machs,

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.ipc_supported_mask	= BIT(SOF_IPC_TYPE_3),

	.ipc_default		= SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC] = "mediatek/sof",

		[SOF_IPC_TYPE_3] = "mediatek/sof",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_3] = "mediatek/sof-tplg",

	},

	.default_fw_filename = {

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

		[SOF_IPC_TYPE_3] = "sof-mt8188.ri",

	},

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

	.ops = &sof_mt8188_ops,

sound/soc/sof/mediatek/mt8195/mt8195.c

+5 −5
Original line number Diff line number Diff line
@@ -635,16 +635,16 @@ static struct snd_sof_of_mach sof_mt8195_machs[] = { 


static const struct sof_dev_desc sof_of_mt8195_desc = {

	.of_machines = sof_mt8195_machs,

	.ipc_supported_mask	= BIT(SOF_IPC),

	.ipc_default		= SOF_IPC,

	.ipc_supported_mask	= BIT(SOF_IPC_TYPE_3),

	.ipc_default		= SOF_IPC_TYPE_3,

	.default_fw_path = {

		[SOF_IPC] = "mediatek/sof",

		[SOF_IPC_TYPE_3] = "mediatek/sof",

	},

	.default_tplg_path = {

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

		[SOF_IPC_TYPE_3] = "mediatek/sof-tplg",

	},

	.default_fw_filename = {

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

		[SOF_IPC_TYPE_3] = "sof-mt8195.ri",

	},

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

	.ops = &sof_mt8195_ops,