ASoC: intel/sdw_utils: move rtk dmic helper functions

Move rtk SoundWire dmic helper functions implementation to sdw_utils
folder to make it generic.

Link: https://github.com/thesofproject/linux/pull/5068
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801091446.10457-12-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h
index 0ffbd9847532df436bc81175c526f394548dd446..9fa102fc03c37a76c5e8ad7dbcb074c3979d53a4 100644 (file)
--- a/include/sound/soc_sdw_utils.h
+++ b/include/sound/soc_sdw_utils.h
@@ -72,4 +72,7 @@ const char *asoc_sdw_get_codec_name(struct device *dev,
 /* DMIC support */
 int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
 
+/* dai_link init callbacks */
+int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+
 #endif

diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 8ac6f7b5fbeed35b8b23ec9b0ce1554f8775d1b8..dca8eecfa82030ffb8a7615dbecad14d98368b0a 100644 (file)
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -40,7 +40,6 @@ snd-soc-sof-sdw-y += sof_sdw.o                                \
                        sof_sdw_rt5682.o sof_sdw_rt700.o        \
                        sof_sdw_rt711.o sof_sdw_rt_sdca_jack_common.o   \
                        sof_sdw_rt712_sdca.o sof_sdw_rt722_sdca.o       \
-                       sof_sdw_rt_dmic.o                       \
                        sof_sdw_cs42l42.o sof_sdw_cs42l43.o     \
                        sof_sdw_cs_amp.o                        \
                        sof_sdw_hdmi.o

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index 81b654407651ade3ddb661fa0373e450709a50c6..73227ebf8e7b800165a8d9ca2ffbc36dc97234d0 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -162,7 +162,6 @@ int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai
 int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
-int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 

diff --git a/sound/soc/intel/boards/sof_sdw_rt_dmic.c b/sound/soc/intel/boards/sof_sdw_rt_dmic.c
deleted file mode 100644 (file)
index 64960b0..0000000
--- a/sound/soc/intel/boards/sof_sdw_rt_dmic.c
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (c) 2024 Intel Corporation
-
-/*
- * sof_sdw_rt_dmic - Helpers to handle Realtek SDW DMIC from generic machine driver
- */
-
-#include <linux/device.h>
-#include <linux/errno.h>
-#include <sound/soc.h>
-#include <sound/soc-acpi.h>
-#include "sof_board_helpers.h"
-#include "sof_sdw_common.h"
-
-int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
-{
-       struct snd_soc_card *card = rtd->card;
-       struct snd_soc_component *component;
-       char *mic_name;
-
-       component = dai->component;
-
-       /*
-        * rt715-sdca (aka rt714) is a special case that uses different name in card->components
-        * and component->name_prefix.
-        */
-       if (!strcmp(component->name_prefix, "rt714"))
-               mic_name = devm_kasprintf(card->dev, GFP_KERNEL, "rt715-sdca");
-       else
-               mic_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s", component->name_prefix);
-
-       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-                                         "%s mic:%s", card->components,
-                                         mic_name);
-       if (!card->components)
-               return -ENOMEM;
-
-       dev_dbg(card->dev, "card->components: %s\n", card->components);
-
-       return 0;
-}
-MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);

diff --git a/sound/soc/sdw_utils/Makefile b/sound/soc/sdw_utils/Makefile
index de8aff8744d81819a647f5c823eea9c94d869f1e..2c8f70465a125fd987633e26ef9db8f246b51420 100644 (file)
--- a/sound/soc/sdw_utils/Makefile
+++ b/sound/soc/sdw_utils/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
-snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o
+snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o
 obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o

diff --git a/sound/soc/sdw_utils/soc_sdw_rt_dmic.c b/sound/soc/sdw_utils/soc_sdw_rt_dmic.c
new file mode 100644 (file)
index 0000000..7f24806
--- /dev/null
+++ b/sound/soc/sdw_utils/soc_sdw_rt_dmic.c
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// This file incorporates work covered by the following copyright notice:
+// Copyright (c) 2024 Intel Corporation
+// Copyright (c) 2024 Advanced Micro Devices, Inc.
+
+/*
+ * soc_sdw_rt_dmic - Helpers to handle Realtek SDW DMIC from generic machine driver
+ */
+
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <sound/soc.h>
+#include <sound/soc-acpi.h>
+#include <sound/soc_sdw_utils.h>
+
+int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct snd_soc_component *component;
+       char *mic_name;
+
+       component = dai->component;
+
+       /*
+        * rt715-sdca (aka rt714) is a special case that uses different name in card->components
+        * and component->name_prefix.
+        */
+       if (!strcmp(component->name_prefix, "rt714"))
+               mic_name = devm_kasprintf(card->dev, GFP_KERNEL, "rt715-sdca");
+       else
+               mic_name = devm_kasprintf(card->dev, GFP_KERNEL, "%s", component->name_prefix);
+
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                         "%s mic:%s", card->components,
+                                         mic_name);
+       if (!card->components)
+               return -ENOMEM;
+
+       dev_dbg(card->dev, "card->components: %s\n", card->components);
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_rt_dmic_rtd_init, SND_SOC_SDW_UTILS);