ASoC: intel/sdw_utils: move soundwire machine driver helper functions

Move below Intel SoundWire machine driver helper functions to
soc_sdw_utils.c file so that it can be used by other platform machine
driver.
- asoc_sdw_is_unique_device()
- asoc_sdw_get_codec_name()

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-10-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 1ae5523bbcf87d5a3bde0eb48852fe98331a7c3d..7ca3a6afdfb1372c753d44a761626b29f0242a1c 100644 (file)
--- a/include/sound/soc_sdw_utils.h
+++ b/include/sound/soc_sdw_utils.h
@@ -10,6 +10,7 @@
 #define SOC_SDW_UTILS_H
 
 #include <sound/soc.h>
+#include <sound/soc-acpi.h>
 
 #define SOC_SDW_MAX_DAI_NUM             8
 
@@ -63,4 +64,8 @@ int asoc_sdw_hw_params(struct snd_pcm_substream *substream,
 int asoc_sdw_hw_free(struct snd_pcm_substream *substream);
 void asoc_sdw_shutdown(struct snd_pcm_substream *substream);
 
+const char *asoc_sdw_get_codec_name(struct device *dev,
+                                   const struct asoc_sdw_codec_info *codec_info,
+                                   const struct snd_soc_acpi_link_adr *adr_link,
+                                   int adr_index);
 #endif

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index fc73db4af1868b6377ab13a528544fa67dbc18db..e1d2b744987fed163a472abaa7160bb85bb5e01e 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -1190,66 +1190,6 @@ static int init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai
        return 0;
 }
 
-static bool asoc_sdw_is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
-                                     unsigned int sdw_version,
-                                     unsigned int mfg_id,
-                                     unsigned int part_id,
-                                     unsigned int class_id,
-                                     int index_in_link)
-{
-       int i;
-
-       for (i = 0; i < adr_link->num_adr; i++) {
-               unsigned int sdw1_version, mfg1_id, part1_id, class1_id;
-               u64 adr;
-
-               /* skip itself */
-               if (i == index_in_link)
-                       continue;
-
-               adr = adr_link->adr_d[i].adr;
-
-               sdw1_version = SDW_VERSION(adr);
-               mfg1_id = SDW_MFG_ID(adr);
-               part1_id = SDW_PART_ID(adr);
-               class1_id = SDW_CLASS_ID(adr);
-
-               if (sdw_version == sdw1_version &&
-                   mfg_id == mfg1_id &&
-                   part_id == part1_id &&
-                   class_id == class1_id)
-                       return false;
-       }
-
-       return true;
-}
-
-static const char *asoc_sdw_get_codec_name(struct device *dev,
-                                          const struct asoc_sdw_codec_info *codec_info,
-                                          const struct snd_soc_acpi_link_adr *adr_link,
-                                          int adr_index)
-{
-       u64 adr = adr_link->adr_d[adr_index].adr;
-       unsigned int sdw_version = SDW_VERSION(adr);
-       unsigned int link_id = SDW_DISCO_LINK_ID(adr);
-       unsigned int unique_id = SDW_UNIQUE_ID(adr);
-       unsigned int mfg_id = SDW_MFG_ID(adr);
-       unsigned int part_id = SDW_PART_ID(adr);
-       unsigned int class_id = SDW_CLASS_ID(adr);
-
-       if (codec_info->codec_name)
-               return devm_kstrdup(dev, codec_info->codec_name, GFP_KERNEL);
-       else if (asoc_sdw_is_unique_device(adr_link, sdw_version, mfg_id, part_id,
-                                          class_id, adr_index))
-               return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x",
-                                     link_id, mfg_id, part_id, class_id);
-       else
-               return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x:%01x",
-                                     link_id, mfg_id, part_id, class_id, unique_id);
-
-       return NULL;
-}
-
 static int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;

diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index cccab173fd176e34e5dfda80caf04e5ffcffec00..2b59ddc610780750e961c2b25038126164a273ac 100644 (file)
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -146,5 +146,66 @@ void asoc_sdw_shutdown(struct snd_pcm_substream *substream)
 }
 EXPORT_SYMBOL_NS(asoc_sdw_shutdown, SND_SOC_SDW_UTILS);
 
+static bool asoc_sdw_is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
+                                     unsigned int sdw_version,
+                                     unsigned int mfg_id,
+                                     unsigned int part_id,
+                                     unsigned int class_id,
+                                     int index_in_link)
+{
+       int i;
+
+       for (i = 0; i < adr_link->num_adr; i++) {
+               unsigned int sdw1_version, mfg1_id, part1_id, class1_id;
+               u64 adr;
+
+               /* skip itself */
+               if (i == index_in_link)
+                       continue;
+
+               adr = adr_link->adr_d[i].adr;
+
+               sdw1_version = SDW_VERSION(adr);
+               mfg1_id = SDW_MFG_ID(adr);
+               part1_id = SDW_PART_ID(adr);
+               class1_id = SDW_CLASS_ID(adr);
+
+               if (sdw_version == sdw1_version &&
+                   mfg_id == mfg1_id &&
+                   part_id == part1_id &&
+                   class_id == class1_id)
+                       return false;
+       }
+
+       return true;
+}
+
+const char *asoc_sdw_get_codec_name(struct device *dev,
+                                   const struct asoc_sdw_codec_info *codec_info,
+                                   const struct snd_soc_acpi_link_adr *adr_link,
+                                   int adr_index)
+{
+       u64 adr = adr_link->adr_d[adr_index].adr;
+       unsigned int sdw_version = SDW_VERSION(adr);
+       unsigned int link_id = SDW_DISCO_LINK_ID(adr);
+       unsigned int unique_id = SDW_UNIQUE_ID(adr);
+       unsigned int mfg_id = SDW_MFG_ID(adr);
+       unsigned int part_id = SDW_PART_ID(adr);
+       unsigned int class_id = SDW_CLASS_ID(adr);
+
+       if (codec_info->codec_name)
+               return devm_kstrdup(dev, codec_info->codec_name, GFP_KERNEL);
+       else if (asoc_sdw_is_unique_device(adr_link, sdw_version, mfg_id, part_id,
+                                          class_id, adr_index))
+               return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x",
+                                     link_id, mfg_id, part_id, class_id);
+       else
+               return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x:%01x",
+                                     link_id, mfg_id, part_id, class_id, unique_id);
+
+       return NULL;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_get_codec_name, SND_SOC_SDW_UTILS);
+
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SoundWire ASoC helpers");