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: 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-9-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c
index f587edf9e0a70fdeb786a71b8ebfcd5d529c4360..8544d65bc2cfae3cab3838e7a0f39b2d40fdad84 100644 (file)
--- a/sound/soc/sof/mediatek/mt8186/mt8186.c
+++ b/sound/soc/sof/mediatek/mt8186/mt8186.c
@@ -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,

diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c
index 7d6a568556ea478def51f260e7aec65ba5af03f4..fab2d5af86100791e2ddab586ac0b06b80a05b36 100644 (file)
--- a/sound/soc/sof/mediatek/mt8195/mt8195.c
+++ b/sound/soc/sof/mediatek/mt8195/mt8195.c
@@ -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,