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: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20230919104226.32239-7-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index 2844d9a8040ad91a021cf62b9ee3a096d1f0b4ab..65a7041cbab9d75b14ab4adbf4195bb39cb9574c 100644 (file)
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -609,32 +609,32 @@ static 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,
+       .ipc_supported_mask     = BIT(SOF_IPC_TYPE_3),
+       .ipc_default            = SOF_IPC_TYPE_3,
        .default_fw_path = {
-               [SOF_IPC] = "imx/sof",
+               [SOF_IPC_TYPE_3] = "imx/sof",
        },
        .default_tplg_path = {
-               [SOF_IPC] = "imx/sof-tplg",
+               [SOF_IPC_TYPE_3] = "imx/sof-tplg",
        },
        .default_fw_filename = {
-               [SOF_IPC] = "sof-imx8x.ri",
+               [SOF_IPC_TYPE_3] = "sof-imx8x.ri",
        },
        .nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
        .ops = &sof_imx8x_ops,
 };
 
 static struct sof_dev_desc sof_of_imx8qm_desc = {
-       .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] = "imx/sof",
+               [SOF_IPC_TYPE_3] = "imx/sof",
        },
        .default_tplg_path = {
-               [SOF_IPC] = "imx/sof-tplg",
+               [SOF_IPC_TYPE_3] = "imx/sof-tplg",
        },
        .default_fw_filename = {
-               [SOF_IPC] = "sof-imx8.ri",
+               [SOF_IPC_TYPE_3] = "sof-imx8.ri",
        },
        .nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
        .ops = &sof_imx8_ops,

diff --git a/sound/soc/sof/imx/imx8m.c b/sound/soc/sof/imx/imx8m.c
index 1243f8a6141eaa23965519e56b72cbe381b9e4d3..9d58dda8f079d1028a2212c0c84a0792505ba880 100644 (file)
--- a/sound/soc/sof/imx/imx8m.c
+++ b/sound/soc/sof/imx/imx8m.c
@@ -471,16 +471,16 @@ static 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,
+       .ipc_supported_mask     = BIT(SOF_IPC_TYPE_3),
+       .ipc_default            = SOF_IPC_TYPE_3,
        .default_fw_path = {
-               [SOF_IPC] = "imx/sof",
+               [SOF_IPC_TYPE_3] = "imx/sof",
        },
        .default_tplg_path = {
-               [SOF_IPC] = "imx/sof-tplg",
+               [SOF_IPC_TYPE_3] = "imx/sof-tplg",
        },
        .default_fw_filename = {
-               [SOF_IPC] = "sof-imx8m.ri",
+               [SOF_IPC_TYPE_3] = "sof-imx8m.ri",
        },
        .nocodec_tplg_filename = "sof-imx8-nocodec.tplg",
        .ops = &sof_imx8m_ops,

diff --git a/sound/soc/sof/imx/imx8ulp.c b/sound/soc/sof/imx/imx8ulp.c
index 4a562c9856e93c1bcd111f70e68c3513b43699bc..2673c1d4ddea16f543511374aff0a3c3f84c798b 100644 (file)
--- a/sound/soc/sof/imx/imx8ulp.c
+++ b/sound/soc/sof/imx/imx8ulp.c
@@ -478,16 +478,16 @@ static struct snd_sof_dsp_ops sof_imx8ulp_ops = {
 };
 
 static struct sof_dev_desc sof_of_imx8ulp_desc = {
-       .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] = "imx/sof",
+               [SOF_IPC_TYPE_3] = "imx/sof",
        },
        .default_tplg_path = {
-               [SOF_IPC] = "imx/sof-tplg",
+               [SOF_IPC_TYPE_3] = "imx/sof-tplg",
        },
        .default_fw_filename = {
-               [SOF_IPC] = "sof-imx8ulp.ri",
+               [SOF_IPC_TYPE_3] = "sof-imx8ulp.ri",
        },
        .nocodec_tplg_filename = "sof-imx8ulp-nocodec.tplg",
        .ops = &sof_imx8ulp_ops,