ASoC: intel/sdw_utils: move rtk jack common helper functions
authorVijendar Mukunda <Vijendar.Mukunda@amd.com>
Thu, 1 Aug 2024 09:14:31 +0000 (14:44 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 1 Aug 2024 11:44:05 +0000 (12:44 +0100)
Move RTK codec jack common helper functions to common place holder
(sdw_utils folder) to make it generic so that it will be used by
other platform machine driver code.

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-17-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc_sdw_utils.h
sound/soc/intel/boards/Makefile
sound/soc/intel/boards/sof_sdw.c
sound/soc/intel/boards/sof_sdw_common.h
sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c [deleted file]
sound/soc/sdw_utils/Makefile
sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c [new file with mode: 0644]

index ed97d78336da18c641754165c01f3ac1ea9fad38..6b6bab8d3310ba8945773c2a34a4d62b7fbf6de4 100644 (file)
@@ -13,6 +13,8 @@
 #include <sound/soc-acpi.h>
 
 #define SOC_SDW_MAX_DAI_NUM             8
+#define SOC_SDW_MAX_NO_PROPS           2
+#define SOC_SDW_JACK_JDSRC(quirk)      ((quirk) & GENMASK(3, 0))
 
 struct asoc_sdw_codec_info;
 
@@ -63,6 +65,7 @@ struct asoc_sdw_mc_private {
        bool append_dai_type;
        bool ignore_internal_dmic;
        void *private;
+       unsigned long mc_quirk;
 };
 
 int asoc_sdw_startup(struct snd_pcm_substream *substream);
@@ -82,8 +85,16 @@ const char *asoc_sdw_get_codec_name(struct device *dev,
 /* DMIC support */
 int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
 
+/* RT711-SDCA support */
+int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
+                              struct snd_soc_dai_link *dai_links,
+                              struct asoc_sdw_codec_info *info,
+                              bool playback);
+int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
+
 /* dai_link init callbacks */
 int asoc_sdw_rt_dmic_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);
 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_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
index 80c33e4b4cfeebbbc0650e736ee39aebefbe0599..0f1b2c2881624410b6b5d089beafc63a5c9ba64e 100644 (file)
@@ -38,7 +38,6 @@ snd-soc-sof-sdw-y += sof_sdw.o                                \
                        sof_sdw_maxim.o sof_sdw_rt_amp.o        \
                        bridge_cs35l56.o                        \
                        sof_sdw_rt700.o sof_sdw_rt711.o         \
-                       sof_sdw_rt_sdca_jack_common.o           \
                        sof_sdw_cs42l42.o sof_sdw_cs42l43.o     \
                        sof_sdw_cs_amp.o                        \
                        sof_sdw_hdmi.o
index 236e3fab66b9eb1211a47984ea69fee23f35f7da..e310843974a7baba2562045850310f06363a8f61 100644 (file)
@@ -1973,6 +1973,7 @@ static int mc_probe(struct platform_device *pdev)
 
        log_quirks(card->dev);
 
+       ctx->mc_quirk = sof_sdw_quirk;
        /* reset amp_num to ensure amp_num++ starts from 0 in each probe */
        for (i = 0; i < ARRAY_SIZE(codec_info_list); i++)
                codec_info_list[i].amp_num = 0;
index bbd09698c69d1538039c4b2566716294643f0b1f..af656716c9d261432dbcb9b7d893f26a1d6becf2 100644 (file)
@@ -15,7 +15,6 @@
 #include <sound/soc_sdw_utils.h>
 #include "sof_hdmi_common.h"
 
-#define SOC_SDW_MAX_NO_PROPS 2
 #define MAX_HDMI_NUM 4
 #define SOC_SDW_UNUSED_DAI_ID -1
 #define SOC_SDW_JACK_OUT_DAI_ID 0
@@ -45,7 +44,6 @@ enum {
        SOF_I2S_SSP5 = BIT(5),
 };
 
-#define SOC_SDW_JACK_JDSRC(quirk)              ((quirk) & GENMASK(3, 0))
 /* Deprecated and no longer supported by the code */
 #define SOC_SDW_FOUR_SPK               BIT(4)
 #define SOF_SDW_TGL_HDMI               BIT(5)
@@ -98,13 +96,6 @@ int asoc_sdw_rt711_init(struct snd_soc_card *card,
                        bool playback);
 int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
 
-/* RT711-SDCA support */
-int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
-                              struct snd_soc_dai_link *dai_links,
-                              struct asoc_sdw_codec_info *info,
-                              bool playback);
-int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
-
 /* RT1308 I2S support */
 extern const struct snd_soc_ops soc_sdw_rt1308_i2s_ops;
 
@@ -154,6 +145,5 @@ int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_
 int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_rt711_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);
 
 #endif
diff --git a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
deleted file mode 100644 (file)
index 8059e48..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (c) 2020 Intel Corporation
-
-/*
- *  sof_sdw_rt711_sdca - Helpers to handle RT711-SDCA from generic machine driver
- */
-
-#include <linux/device.h>
-#include <linux/errno.h>
-#include <linux/input.h>
-#include <linux/soundwire/sdw.h>
-#include <linux/soundwire/sdw_type.h>
-#include <sound/control.h>
-#include <sound/soc.h>
-#include <sound/soc-acpi.h>
-#include <sound/soc-dapm.h>
-#include <sound/jack.h>
-#include "sof_sdw_common.h"
-
-/*
- * Note this MUST be called before snd_soc_register_card(), so that the props
- * are in place before the codec component driver's probe function parses them.
- */
-static int rt_sdca_jack_add_codec_device_props(struct device *sdw_dev)
-{
-       struct property_entry props[SOC_SDW_MAX_NO_PROPS] = {};
-       struct fwnode_handle *fwnode;
-       int ret;
-
-       if (!SOC_SDW_JACK_JDSRC(sof_sdw_quirk))
-               return 0;
-
-       props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOC_SDW_JACK_JDSRC(sof_sdw_quirk));
-
-       fwnode = fwnode_create_software_node(props, NULL);
-       if (IS_ERR(fwnode))
-               return PTR_ERR(fwnode);
-
-       ret = device_add_software_node(sdw_dev, to_software_node(fwnode));
-
-       fwnode_handle_put(fwnode);
-
-       return ret;
-}
-
-static const struct snd_soc_dapm_route rt711_sdca_map[] = {
-       { "Headphone", NULL, "rt711 HP" },
-       { "rt711 MIC2", NULL, "Headset Mic" },
-};
-
-static const struct snd_soc_dapm_route rt712_sdca_map[] = {
-       { "Headphone", NULL, "rt712 HP" },
-       { "rt712 MIC2", NULL, "Headset Mic" },
-};
-
-static const struct snd_soc_dapm_route rt713_sdca_map[] = {
-       { "Headphone", NULL, "rt713 HP" },
-       { "rt713 MIC2", NULL, "Headset Mic" },
-};
-
-static const struct snd_soc_dapm_route rt722_sdca_map[] = {
-       { "Headphone", NULL, "rt722 HP" },
-       { "rt722 MIC2", NULL, "Headset Mic" },
-};
-
-static struct snd_soc_jack_pin rt_sdca_jack_pins[] = {
-       {
-               .pin    = "Headphone",
-               .mask   = SND_JACK_HEADPHONE,
-       },
-       {
-               .pin    = "Headset Mic",
-               .mask   = SND_JACK_MICROPHONE,
-       },
-};
-
-/*
- * The sdca suffix is required for rt711 since there are two generations of the same chip.
- * RT713 is an SDCA device but the sdca suffix is required for backwards-compatibility with
- * previous UCM definitions.
- */
-static const char * const need_sdca_suffix[] = {
-       "rt711", "rt713"
-};
-
-int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
-{
-       struct snd_soc_card *card = rtd->card;
-       struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
-       struct snd_soc_component *component;
-       struct snd_soc_jack *jack;
-       int ret;
-       int i;
-
-       component = dai->component;
-       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-                                         "%s hs:%s",
-                                         card->components, component->name_prefix);
-       if (!card->components)
-               return -ENOMEM;
-
-       for (i = 0; i < ARRAY_SIZE(need_sdca_suffix); i++) {
-               if (strstr(component->name_prefix, need_sdca_suffix[i])) {
-                       /* Add -sdca suffix for existing UCMs */
-                       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-                                                         "%s-sdca", card->components);
-                       if (!card->components)
-                               return -ENOMEM;
-                       break;
-               }
-       }
-
-       if (strstr(component->name_prefix, "rt711")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt711_sdca_map,
-                                             ARRAY_SIZE(rt711_sdca_map));
-       } else if (strstr(component->name_prefix, "rt712")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt712_sdca_map,
-                                             ARRAY_SIZE(rt712_sdca_map));
-       } else if (strstr(component->name_prefix, "rt713")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt713_sdca_map,
-                                             ARRAY_SIZE(rt713_sdca_map));
-       } else if (strstr(component->name_prefix, "rt722")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt722_sdca_map,
-                                             ARRAY_SIZE(rt722_sdca_map));
-       } else {
-               dev_err(card->dev, "%s is not supported\n", component->name_prefix);
-               return -EINVAL;
-       }
-
-       if (ret) {
-               dev_err(card->dev, "rt sdca jack map addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",
-                                        SND_JACK_HEADSET | SND_JACK_BTN_0 |
-                                        SND_JACK_BTN_1 | SND_JACK_BTN_2 |
-                                        SND_JACK_BTN_3,
-                                        &ctx->sdw_headset,
-                                        rt_sdca_jack_pins,
-                                        ARRAY_SIZE(rt_sdca_jack_pins));
-       if (ret) {
-               dev_err(rtd->card->dev, "Headset Jack creation failed: %d\n",
-                       ret);
-               return ret;
-       }
-
-       jack = &ctx->sdw_headset;
-
-       snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
-       snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
-       snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
-       snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
-
-       ret = snd_soc_component_set_jack(component, jack, NULL);
-
-       if (ret)
-               dev_err(rtd->card->dev, "Headset Jack call-back failed: %d\n",
-                       ret);
-
-       return ret;
-}
-
-int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
-{
-       struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
-
-       if (!ctx->headset_codec_dev)
-               return 0;
-
-       if (!SOC_SDW_JACK_JDSRC(sof_sdw_quirk))
-               return 0;
-
-       device_remove_software_node(ctx->headset_codec_dev);
-       put_device(ctx->headset_codec_dev);
-       ctx->headset_codec_dev = NULL;
-
-       return 0;
-}
-
-int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
-                              struct snd_soc_dai_link *dai_links,
-                              struct asoc_sdw_codec_info *info,
-                              bool playback)
-{
-       struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
-       struct device *sdw_dev;
-       int ret;
-
-       /*
-        * Jack detection should be only initialized once for headsets since
-        * the playback/capture is sharing the same jack
-        */
-       if (ctx->headset_codec_dev)
-               return 0;
-
-       sdw_dev = bus_find_device_by_name(&sdw_bus_type, NULL, dai_links->codecs[0].name);
-       if (!sdw_dev)
-               return -EPROBE_DEFER;
-
-       ret = rt_sdca_jack_add_codec_device_props(sdw_dev);
-       if (ret < 0) {
-               put_device(sdw_dev);
-               return ret;
-       }
-       ctx->headset_codec_dev = sdw_dev;
-
-       return 0;
-}
-MODULE_IMPORT_NS(SND_SOC_INTEL_SOF_BOARD_HELPERS);
index fea2b6ae6975d7f0b6139d3206482e3a4d8f25f1..68b8fddeb77e1fc3c8d540c6997d93eaa176f836 100644 (file)
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
 snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \
                       soc_sdw_rt712_sdca.o soc_sdw_rt722_sdca.o        \
-                      soc_sdw_rt5682.o
+                      soc_sdw_rt5682.o soc_sdw_rt_sdca_jack_common.o
 obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o
diff --git a/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c b/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
new file mode 100644 (file)
index 0000000..3e6211d
--- /dev/null
@@ -0,0 +1,214 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// This file incorporates work covered by the following copyright notice:
+// Copyright (c) 2020 Intel Corporation
+// Copyright (c) 2024 Advanced Micro Devices, Inc.
+
+/*
+ *  soc_sdw_rt711_sdca - Helpers to handle RT711-SDCA from generic machine driver
+ */
+
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/input.h>
+#include <linux/soundwire/sdw.h>
+#include <linux/soundwire/sdw_type.h>
+#include <sound/control.h>
+#include <sound/soc.h>
+#include <sound/soc-acpi.h>
+#include <sound/soc-dapm.h>
+#include <sound/jack.h>
+#include <sound/soc_sdw_utils.h>
+
+/*
+ * Note this MUST be called before snd_soc_register_card(), so that the props
+ * are in place before the codec component driver's probe function parses them.
+ */
+static int rt_sdca_jack_add_codec_device_props(struct device *sdw_dev, unsigned long quirk)
+{
+       struct property_entry props[SOC_SDW_MAX_NO_PROPS] = {};
+       struct fwnode_handle *fwnode;
+       int ret;
+
+       if (!SOC_SDW_JACK_JDSRC(quirk))
+               return 0;
+
+       props[0] = PROPERTY_ENTRY_U32("realtek,jd-src", SOC_SDW_JACK_JDSRC(quirk));
+
+       fwnode = fwnode_create_software_node(props, NULL);
+       if (IS_ERR(fwnode))
+               return PTR_ERR(fwnode);
+
+       ret = device_add_software_node(sdw_dev, to_software_node(fwnode));
+
+       fwnode_handle_put(fwnode);
+
+       return ret;
+}
+
+static const struct snd_soc_dapm_route rt711_sdca_map[] = {
+       { "Headphone", NULL, "rt711 HP" },
+       { "rt711 MIC2", NULL, "Headset Mic" },
+};
+
+static const struct snd_soc_dapm_route rt712_sdca_map[] = {
+       { "Headphone", NULL, "rt712 HP" },
+       { "rt712 MIC2", NULL, "Headset Mic" },
+};
+
+static const struct snd_soc_dapm_route rt713_sdca_map[] = {
+       { "Headphone", NULL, "rt713 HP" },
+       { "rt713 MIC2", NULL, "Headset Mic" },
+};
+
+static const struct snd_soc_dapm_route rt722_sdca_map[] = {
+       { "Headphone", NULL, "rt722 HP" },
+       { "rt722 MIC2", NULL, "Headset Mic" },
+};
+
+static struct snd_soc_jack_pin rt_sdca_jack_pins[] = {
+       {
+               .pin    = "Headphone",
+               .mask   = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin    = "Headset Mic",
+               .mask   = SND_JACK_MICROPHONE,
+       },
+};
+
+/*
+ * The sdca suffix is required for rt711 since there are two generations of the same chip.
+ * RT713 is an SDCA device but the sdca suffix is required for backwards-compatibility with
+ * previous UCM definitions.
+ */
+static const char * const need_sdca_suffix[] = {
+       "rt711", "rt713"
+};
+
+int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
+       struct snd_soc_component *component;
+       struct snd_soc_jack *jack;
+       int ret;
+       int i;
+
+       component = dai->component;
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                         "%s hs:%s",
+                                         card->components, component->name_prefix);
+       if (!card->components)
+               return -ENOMEM;
+
+       for (i = 0; i < ARRAY_SIZE(need_sdca_suffix); i++) {
+               if (strstr(component->name_prefix, need_sdca_suffix[i])) {
+                       /* Add -sdca suffix for existing UCMs */
+                       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                                         "%s-sdca", card->components);
+                       if (!card->components)
+                               return -ENOMEM;
+                       break;
+               }
+       }
+
+       if (strstr(component->name_prefix, "rt711")) {
+               ret = snd_soc_dapm_add_routes(&card->dapm, rt711_sdca_map,
+                                             ARRAY_SIZE(rt711_sdca_map));
+       } else if (strstr(component->name_prefix, "rt712")) {
+               ret = snd_soc_dapm_add_routes(&card->dapm, rt712_sdca_map,
+                                             ARRAY_SIZE(rt712_sdca_map));
+       } else if (strstr(component->name_prefix, "rt713")) {
+               ret = snd_soc_dapm_add_routes(&card->dapm, rt713_sdca_map,
+                                             ARRAY_SIZE(rt713_sdca_map));
+       } else if (strstr(component->name_prefix, "rt722")) {
+               ret = snd_soc_dapm_add_routes(&card->dapm, rt722_sdca_map,
+                                             ARRAY_SIZE(rt722_sdca_map));
+       } else {
+               dev_err(card->dev, "%s is not supported\n", component->name_prefix);
+               return -EINVAL;
+       }
+
+       if (ret) {
+               dev_err(card->dev, "rt sdca jack map addition failed: %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",
+                                        SND_JACK_HEADSET | SND_JACK_BTN_0 |
+                                        SND_JACK_BTN_1 | SND_JACK_BTN_2 |
+                                        SND_JACK_BTN_3,
+                                        &ctx->sdw_headset,
+                                        rt_sdca_jack_pins,
+                                        ARRAY_SIZE(rt_sdca_jack_pins));
+       if (ret) {
+               dev_err(rtd->card->dev, "Headset Jack creation failed: %d\n",
+                       ret);
+               return ret;
+       }
+
+       jack = &ctx->sdw_headset;
+
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
+
+       ret = snd_soc_component_set_jack(component, jack, NULL);
+
+       if (ret)
+               dev_err(rtd->card->dev, "Headset Jack call-back failed: %d\n",
+                       ret);
+
+       return ret;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_rt_sdca_jack_rtd_init, SND_SOC_SDW_UTILS);
+
+int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
+{
+       struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
+
+       if (!ctx->headset_codec_dev)
+               return 0;
+
+       if (!SOC_SDW_JACK_JDSRC(ctx->mc_quirk))
+               return 0;
+
+       device_remove_software_node(ctx->headset_codec_dev);
+       put_device(ctx->headset_codec_dev);
+       ctx->headset_codec_dev = NULL;
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_rt_sdca_jack_exit, SND_SOC_SDW_UTILS);
+
+int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
+                              struct snd_soc_dai_link *dai_links,
+                              struct asoc_sdw_codec_info *info,
+                              bool playback)
+{
+       struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
+       struct device *sdw_dev;
+       int ret;
+
+       /*
+        * Jack detection should be only initialized once for headsets since
+        * the playback/capture is sharing the same jack
+        */
+       if (ctx->headset_codec_dev)
+               return 0;
+
+       sdw_dev = bus_find_device_by_name(&sdw_bus_type, NULL, dai_links->codecs[0].name);
+       if (!sdw_dev)
+               return -EPROBE_DEFER;
+
+       ret = rt_sdca_jack_add_codec_device_props(sdw_dev, ctx->mc_quirk);
+       if (ret < 0) {
+               put_device(sdw_dev);
+               return ret;
+       }
+       ctx->headset_codec_dev = sdw_dev;
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_rt_sdca_jack_init, SND_SOC_SDW_UTILS);