ASoC: SOF: Kconfig: Rename SND_SOC_SOF_INTEL_IPC4 to SND_SOC_SOF_IPC4

Drop the Intel from the IPC type Kconfig option

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

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 80361139a49ad255a832ef8091001c1ab0e523b5..a741ed96e789768b6b59fa5f2d21910644a097a4 100644 (file)
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -283,7 +283,7 @@ config SND_SOC_SOF_PROBE_WORK_QUEUE
 config SND_SOC_SOF_IPC3
        bool
 
-config SND_SOC_SOF_INTEL_IPC4
+config SND_SOC_SOF_IPC4
        bool
 
 source "sound/soc/sof/amd/Kconfig"

diff --git a/sound/soc/sof/Makefile b/sound/soc/sof/Makefile
index 744d40bd8c8ba3564dfae1c23f0deb0dbff4743b..58f8d468d967f49f9d7982fad3e8e41a788ff25c 100644 (file)
--- a/sound/soc/sof/Makefile
+++ b/sound/soc/sof/Makefile
@@ -8,7 +8,7 @@ ifneq ($(CONFIG_SND_SOC_SOF_IPC3),)
 snd-sof-objs +=        ipc3.o ipc3-loader.o ipc3-topology.o ipc3-control.o ipc3-pcm.o\
                ipc3-dtrace.o
 endif
-ifneq ($(CONFIG_SND_SOC_SOF_INTEL_IPC4),)
+ifneq ($(CONFIG_SND_SOC_SOF_IPC4),)
 snd-sof-objs += ipc4.o ipc4-loader.o ipc4-topology.o ipc4-control.o ipc4-pcm.o\
                ipc4-mtrace.o
 endif
@@ -31,7 +31,7 @@ snd-sof-probes-objs := sof-client-probes.o
 ifneq ($(CONFIG_SND_SOC_SOF_IPC3),)
 snd-sof-probes-objs += sof-client-probes-ipc3.o
 endif
-ifneq ($(CONFIG_SND_SOC_SOF_INTEL_IPC4),)
+ifneq ($(CONFIG_SND_SOC_SOF_IPC4),)
 snd-sof-probes-objs += sof-client-probes-ipc4.o
 endif
 

diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 9d0107932117fc5cb7d40bb4be0b8b6cb0ef1e5a..9de86aaa8d074e86c5ffc85a127a4021fcb3e103 100644 (file)
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -98,7 +98,7 @@ config SND_SOC_SOF_MERRIFIELD
 config SND_SOC_SOF_INTEL_SKL
        tristate
        select SND_SOC_SOF_HDA_COMMON
-       select SND_SOC_SOF_INTEL_IPC4
+       select SND_SOC_SOF_IPC4
 
 config SND_SOC_SOF_SKYLAKE
        tristate "SOF support for SkyLake"
@@ -124,7 +124,7 @@ config SND_SOC_SOF_INTEL_APL
        tristate
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_IPC3
-       select SND_SOC_SOF_INTEL_IPC4
+       select SND_SOC_SOF_IPC4
 
 config SND_SOC_SOF_APOLLOLAKE
        tristate "SOF support for Apollolake"
@@ -151,7 +151,7 @@ config SND_SOC_SOF_INTEL_CNL
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
        select SND_SOC_SOF_IPC3
-       select SND_SOC_SOF_INTEL_IPC4
+       select SND_SOC_SOF_IPC4
 
 config SND_SOC_SOF_CANNONLAKE
        tristate "SOF support for Cannonlake"
@@ -187,7 +187,7 @@ config SND_SOC_SOF_INTEL_ICL
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
        select SND_SOC_SOF_IPC3
-       select SND_SOC_SOF_INTEL_IPC4
+       select SND_SOC_SOF_IPC4
 
 config SND_SOC_SOF_ICELAKE
        tristate "SOF support for Icelake"
@@ -214,7 +214,7 @@ config SND_SOC_SOF_INTEL_TGL
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
        select SND_SOC_SOF_IPC3
-       select SND_SOC_SOF_INTEL_IPC4
+       select SND_SOC_SOF_IPC4
 
 config SND_SOC_SOF_TIGERLAKE
        tristate "SOF support for Tigerlake"
@@ -250,7 +250,7 @@ config SND_SOC_SOF_INTEL_MTL
        tristate
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
-       select SND_SOC_SOF_INTEL_IPC4
+       select SND_SOC_SOF_IPC4
 
 config SND_SOC_SOF_METEORLAKE
        tristate "SOF support for Meteorlake"
@@ -266,7 +266,7 @@ config SND_SOC_SOF_INTEL_LNL
        tristate
        select SND_SOC_SOF_HDA_COMMON
        select SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE
-       select SND_SOC_SOF_INTEL_IPC4
+       select SND_SOC_SOF_IPC4
 
 config SND_SOC_SOF_LUNARLAKE
        tristate "SOF support for Lunarlake"

diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
index b53abc92302669b29361a34f0479fc64704b0b4d..8a7eb3cb019a688f0fdec11a29584eb4b5e52e19 100644 (file)
--- a/sound/soc/sof/ipc.c
+++ b/sound/soc/sof/ipc.c
@@ -169,7 +169,7 @@ struct snd_sof_ipc *snd_sof_ipc_init(struct snd_sof_dev *sdev)
                ops = &ipc3_ops;
                break;
 #endif
-#if defined(CONFIG_SND_SOC_SOF_INTEL_IPC4)
+#if defined(CONFIG_SND_SOC_SOF_IPC4)
        case SOF_INTEL_IPC4:
                ops = &ipc4_ops;
                break;

diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c
index 740b637822db38e4d2d1ad43708ad0be1324389c..390cdb8423ef93106ba878b2b0b78031b83c27c8 100644 (file)
--- a/sound/soc/sof/sof-client-probes.c
+++ b/sound/soc/sof/sof-client-probes.c
@@ -423,7 +423,7 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev,
        priv->host_ops = ops;
 
        switch (sof_client_get_ipc_type(cdev)) {
-#ifdef CONFIG_SND_SOC_SOF_INTEL_IPC4
+#ifdef CONFIG_SND_SOC_SOF_IPC4
        case SOF_INTEL_IPC4:
                priv->ipc_ops = &ipc4_probe_ops;
                break;

diff --git a/sound/soc/sof/sof-client.c b/sound/soc/sof/sof-client.c
index 284de96e779c6d39e21fcee65e0b741dc65570fc..e1a8edbefff7e63cf6bfe29a2b4340967f09cb26 100644 (file)
--- a/sound/soc/sof/sof-client.c
+++ b/sound/soc/sof/sof-client.c
@@ -340,7 +340,7 @@ int sof_client_ipc_set_get_data(struct sof_client_dev *cdev, void *ipc_msg,
 }
 EXPORT_SYMBOL_NS_GPL(sof_client_ipc_set_get_data, SND_SOC_SOF_CLIENT);
 
-#ifdef CONFIG_SND_SOC_SOF_INTEL_IPC4
+#ifdef CONFIG_SND_SOC_SOF_IPC4
 struct sof_ipc4_fw_module *sof_client_ipc4_find_module(struct sof_client_dev *c, const guid_t *uuid)
 {
        struct snd_sof_dev *sdev = c->sdev;