]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: sdw_utils: Add cs42l45 support functions
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Thu, 27 Nov 2025 16:34:25 +0000 (16:34 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 27 Nov 2025 19:18:50 +0000 (19:18 +0000)
Add the helper functions into the machine driver for the cs42l45,
this will register a jack for jack detection and add things into
to the components string if they are needed.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20251127163426.2500633-7-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc_sdw_utils.h
sound/soc/sdw_utils/Makefile
sound/soc/sdw_utils/soc_sdw_cs42l45.c [new file with mode: 0644]

index 48719fde308c0e853312fc439db4052bb0c4972f..227347c8f0b336b23ba929c182896859809dd724 100644 (file)
@@ -257,6 +257,8 @@ int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_da
 int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs42l45_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs42l45_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 /* TI */
index a87c53e1a2c18e8a7b772e52e3ee3bf03eaa134e..e8bd5ffb1a6ade72b10af357756f1bf242e5456f 100644 (file)
@@ -5,6 +5,7 @@ snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \
                       soc_sdw_rt_amp.o soc_sdw_rt_mf_sdca.o            \
                       soc_sdw_bridge_cs35l56.o                         \
                       soc_sdw_cs42l42.o soc_sdw_cs42l43.o              \
+                      soc_sdw_cs42l45.o                                \
                       soc_sdw_cs_amp.o                                 \
                       soc_sdw_maxim.o \
                       soc_sdw_ti_amp.o
diff --git a/sound/soc/sdw_utils/soc_sdw_cs42l45.c b/sound/soc/sdw_utils/soc_sdw_cs42l45.c
new file mode 100644 (file)
index 0000000..647923d
--- /dev/null
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Based on sof_sdw_rt5682.c
+// This file incorporates work covered by the following copyright notice:
+// Copyright (c) 2023 Intel Corporation
+// Copyright (c) 2024 Advanced Micro Devices, Inc.
+
+/*
+ *  soc_sdw_cs42l45 - Helpers to handle CS42L45 from generic machine driver
+ */
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <sound/jack.h>
+#include <sound/soc.h>
+#include <sound/soc-card.h>
+#include <sound/soc-component.h>
+#include <sound/soc-dai.h>
+#include <sound/soc_sdw_utils.h>
+
+static struct snd_soc_jack_pin soc_jack_pins[] = {
+       {
+               .pin    = "cs42l45 OT 43 Headphone",
+               .mask   = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin    = "cs42l45 OT 45 Headset",
+               .mask   = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin    = "cs42l45 IT 31 Microphone",
+               .mask   = SND_JACK_MICROPHONE,
+       },
+       {
+               .pin    = "cs42l45 IT 33 Headset",
+               .mask   = SND_JACK_MICROPHONE,
+       },
+};
+
+int asoc_sdw_cs42l45_hs_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 = snd_soc_rtd_to_codec(rtd, 0)->component;
+       struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
+       struct snd_soc_jack *jack = &ctx->sdw_headset;
+       int ret;
+
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL, "%s hs:cs42l45",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       ret = snd_soc_card_jack_new_pins(card, "Jack", SND_JACK_MECHANICAL |
+                                        SND_JACK_HEADSET | SND_JACK_LINEOUT, jack,
+                                        soc_jack_pins, ARRAY_SIZE(soc_jack_pins));
+       if (ret) {
+               dev_err(card->dev, "Failed to create jack: %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_component_set_jack(component, jack, NULL);
+       if (ret) {
+               dev_err(card->dev, "Failed to register jack: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_cs42l45_hs_rtd_init, "SND_SOC_SDW_UTILS");
+
+int asoc_sdw_cs42l45_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+{
+       struct snd_soc_card *card = rtd->card;
+
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL, "%s mic:cs42l45-dmic",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_cs42l45_dmic_rtd_init, "SND_SOC_SDW_UTILS");