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

diff --git a/sound/soc/sof/amd/pci-rmb.c b/sound/soc/sof/amd/pci-rmb.c
index 9935e457b467b02b1609e31c40ab3a0e480719af..72e211b5f7a489c36898c0f03c6a60b0152eba4b 100644 (file)
--- a/sound/soc/sof/amd/pci-rmb.c
+++ b/sound/soc/sof/amd/pci-rmb.c
@@ -47,16 +47,16 @@ static const struct sof_dev_desc rembrandt_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info              = &rembrandt_chip_info,
-       .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] = "amd/sof",
+               [SOF_IPC_TYPE_3] = "amd/sof",
        },
        .default_tplg_path      = {
-               [SOF_IPC] = "amd/sof-tplg",
+               [SOF_IPC_TYPE_3] = "amd/sof-tplg",
        },
        .default_fw_filename    = {
-               [SOF_IPC] = "sof-rmb.ri",
+               [SOF_IPC_TYPE_3] = "sof-rmb.ri",
        },
        .nocodec_tplg_filename  = "sof-acp.tplg",
        .ops                    = &sof_rembrandt_ops,

diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c
index c72d5d8aff8e6aeb80f96e06a947618bff80cb38..a0195e9b400c8989748e1896f4b889fc509372ee 100644 (file)
--- a/sound/soc/sof/amd/pci-rn.c
+++ b/sound/soc/sof/amd/pci-rn.c
@@ -47,16 +47,16 @@ 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,
+       .ipc_supported_mask     = BIT(SOF_IPC_TYPE_3),
+       .ipc_default            = SOF_IPC_TYPE_3,
        .default_fw_path = {
-               [SOF_IPC] = "amd/sof",
+               [SOF_IPC_TYPE_3] = "amd/sof",
        },
        .default_tplg_path = {
-               [SOF_IPC] = "amd/sof-tplg",
+               [SOF_IPC_TYPE_3] = "amd/sof-tplg",
        },
        .default_fw_filename    = {
-               [SOF_IPC] = "sof-rn.ri",
+               [SOF_IPC_TYPE_3] = "sof-rn.ri",
        },
        .nocodec_tplg_filename  = "sof-acp.tplg",
        .ops                    = &sof_renoir_ops,

diff --git a/sound/soc/sof/amd/pci-vangogh.c b/sound/soc/sof/amd/pci-vangogh.c
index d8be42fbcb6dd8083016dd699eb59a1fd1dbc8c6..5cd3ac84752fb83fa030c5f91614594c092ffa1c 100644 (file)
--- a/sound/soc/sof/amd/pci-vangogh.c
+++ b/sound/soc/sof/amd/pci-vangogh.c
@@ -45,16 +45,16 @@ static const struct sof_dev_desc vangogh_desc = {
        .resindex_imr_base      = -1,
        .irqindex_host_ipc      = -1,
        .chip_info              = &vangogh_chip_info,
-       .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] = "amd/sof",
+               [SOF_IPC_TYPE_3] = "amd/sof",
        },
        .default_tplg_path      = {
-               [SOF_IPC] = "amd/sof-tplg",
+               [SOF_IPC_TYPE_3] = "amd/sof-tplg",
        },
        .default_fw_filename    = {
-               [SOF_IPC] = "sof-vangogh.ri",
+               [SOF_IPC_TYPE_3] = "sof-vangogh.ri",
        },
        .nocodec_tplg_filename  = "sof-acp.tplg",
        .ops                    = &sof_vangogh_ops,