Commit 6a645a55 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown

ASoC: SOF: imx: 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-7-peter.ujfalusi@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3104c326
...@@ -609,32 +609,32 @@ static struct snd_sof_dsp_ops sof_imx8x_ops = { ...@@ -609,32 +609,32 @@ static struct snd_sof_dsp_ops sof_imx8x_ops = {
}; };
static struct sof_dev_desc sof_of_imx8qxp_desc = { static struct sof_dev_desc sof_of_imx8qxp_desc = {
.ipc_supported_mask = BIT(SOF_IPC), .ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
.ipc_default = SOF_IPC, .ipc_default = SOF_IPC_TYPE_3,
.default_fw_path = { .default_fw_path = {
[SOF_IPC] = "imx/sof", [SOF_IPC_TYPE_3] = "imx/sof",
}, },
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "imx/sof-tplg", [SOF_IPC_TYPE_3] = "imx/sof-tplg",
}, },
.default_fw_filename = { .default_fw_filename = {
[SOF_IPC] = "sof-imx8x.ri", [SOF_IPC_TYPE_3] = "sof-imx8x.ri",
}, },
.nocodec_tplg_filename = "sof-imx8-nocodec.tplg", .nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
.ops = &sof_imx8x_ops, .ops = &sof_imx8x_ops,
}; };
static struct sof_dev_desc sof_of_imx8qm_desc = { static struct sof_dev_desc sof_of_imx8qm_desc = {
.ipc_supported_mask = BIT(SOF_IPC), .ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
.ipc_default = SOF_IPC, .ipc_default = SOF_IPC_TYPE_3,
.default_fw_path = { .default_fw_path = {
[SOF_IPC] = "imx/sof", [SOF_IPC_TYPE_3] = "imx/sof",
}, },
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "imx/sof-tplg", [SOF_IPC_TYPE_3] = "imx/sof-tplg",
}, },
.default_fw_filename = { .default_fw_filename = {
[SOF_IPC] = "sof-imx8.ri", [SOF_IPC_TYPE_3] = "sof-imx8.ri",
}, },
.nocodec_tplg_filename = "sof-imx8-nocodec.tplg", .nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
.ops = &sof_imx8_ops, .ops = &sof_imx8_ops,
......
...@@ -471,16 +471,16 @@ static struct snd_sof_dsp_ops sof_imx8m_ops = { ...@@ -471,16 +471,16 @@ static struct snd_sof_dsp_ops sof_imx8m_ops = {
}; };
static struct sof_dev_desc sof_of_imx8mp_desc = { static struct sof_dev_desc sof_of_imx8mp_desc = {
.ipc_supported_mask = BIT(SOF_IPC), .ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
.ipc_default = SOF_IPC, .ipc_default = SOF_IPC_TYPE_3,
.default_fw_path = { .default_fw_path = {
[SOF_IPC] = "imx/sof", [SOF_IPC_TYPE_3] = "imx/sof",
}, },
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "imx/sof-tplg", [SOF_IPC_TYPE_3] = "imx/sof-tplg",
}, },
.default_fw_filename = { .default_fw_filename = {
[SOF_IPC] = "sof-imx8m.ri", [SOF_IPC_TYPE_3] = "sof-imx8m.ri",
}, },
.nocodec_tplg_filename = "sof-imx8-nocodec.tplg", .nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
.ops = &sof_imx8m_ops, .ops = &sof_imx8m_ops,
......
...@@ -478,16 +478,16 @@ static struct snd_sof_dsp_ops sof_imx8ulp_ops = { ...@@ -478,16 +478,16 @@ static struct snd_sof_dsp_ops sof_imx8ulp_ops = {
}; };
static struct sof_dev_desc sof_of_imx8ulp_desc = { static struct sof_dev_desc sof_of_imx8ulp_desc = {
.ipc_supported_mask = BIT(SOF_IPC), .ipc_supported_mask = BIT(SOF_IPC_TYPE_3),
.ipc_default = SOF_IPC, .ipc_default = SOF_IPC_TYPE_3,
.default_fw_path = { .default_fw_path = {
[SOF_IPC] = "imx/sof", [SOF_IPC_TYPE_3] = "imx/sof",
}, },
.default_tplg_path = { .default_tplg_path = {
[SOF_IPC] = "imx/sof-tplg", [SOF_IPC_TYPE_3] = "imx/sof-tplg",
}, },
.default_fw_filename = { .default_fw_filename = {
[SOF_IPC] = "sof-imx8ulp.ri", [SOF_IPC_TYPE_3] = "sof-imx8ulp.ri",
}, },
.nocodec_tplg_filename = "sof-imx8ulp-nocodec.tplg", .nocodec_tplg_filename = "sof-imx8ulp-nocodec.tplg",
.ops = &sof_imx8ulp_ops, .ops = &sof_imx8ulp_ops,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment