]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: sdw_utils: add soc_sdw_es9356
authorZhang Yi <zhangyi@everest-semi.com>
Wed, 13 May 2026 03:15:49 +0000 (11:15 +0800)
committerMark Brown <broonie@kernel.org>
Thu, 14 May 2026 00:52:46 +0000 (09:52 +0900)
Add a utility program for handling ES9356 in the universal machine driver

Signed-off-by: Zhang Yi <zhangyi@everest-semi.com>
Link: https://patch.msgid.link/20260513031554.5422-2-zhangyi@everest-semi.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_es9356.c [new file with mode: 0644]

index d713ab2f66203fa7b7bcb5bf69560169120cebb1..79c21966220b2403d889af684269d000f72c3668 100644 (file)
@@ -223,6 +223,17 @@ int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,
                              struct asoc_sdw_codec_info *info,
                              bool playback);
 
+/* es9356 codec support */
+int asoc_sdw_es9356_init(struct snd_soc_card *card,
+                              struct snd_soc_dai_link *dai_links,
+                              struct asoc_sdw_codec_info *info,
+                              bool playback);
+int asoc_sdw_es9356_amp_init(struct snd_soc_card *card,
+                              struct snd_soc_dai_link *dai_links,
+                              struct asoc_sdw_codec_info *info,
+                              bool playback);
+int asoc_sdw_es9356_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
+
 /* CS AMP support */
 int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
                                          int *num_dais, int *num_devs);
@@ -278,5 +289,8 @@ int asoc_sdw_ti_amp_initial_settings(struct snd_soc_card *card,
                                     const char *name_prefix);
 int asoc_sdw_ti_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 int asoc_sdw_ti_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_es9356_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_es9356_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_es9356_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
 
 #endif
index a8d091fd374b6ee18255bccaf6e66de8a03c9516..5ae8c69b8b98b7932e163779f9a8a942fc5e156a 100644 (file)
@@ -8,6 +8,7 @@ snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \
                       soc_sdw_cs42l45.o                                \
                       soc_sdw_cs47l47.o                                \
                       soc_sdw_cs_amp.o                                 \
+                      soc_sdw_es9356.o                                 \
                       soc_sdw_maxim.o \
                       soc_sdw_ti_amp.o
 obj-$(CONFIG_SND_SOC_SDW_UTILS) += snd-soc-sdw-utils.o
diff --git a/sound/soc/sdw_utils/soc_sdw_es9356.c b/sound/soc/sdw_utils/soc_sdw_es9356.c
new file mode 100644 (file)
index 0000000..aa405e7
--- /dev/null
@@ -0,0 +1,230 @@
+// 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.
+// Copyright (c) 2025 Everest Semiconductor Co., Ltd
+
+/*
+ *  soc_sdw_es9356 - Helpers to handle ES9356 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 es9356_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("everest,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 es9356_map[] = {
+       /* Headphones */
+       { "Headphone", NULL, "es9356 HP" },
+       { "es9356 MIC1", NULL, "Headset Mic" },
+};
+
+static const struct snd_soc_dapm_route es9356_spk_map[] = {
+       /* Speaker */
+       { "Speaker", NULL, "es9356 SPK" },
+};
+
+static const struct snd_soc_dapm_route es9356_dmic_map[] = {
+       /* DMIC */
+       { "es9356 PDM_DIN", NULL, "DMIC" },
+};
+
+static struct snd_soc_jack_pin es9356_jack_pins[] = {
+       {
+               .pin    = "Headphone",
+               .mask   = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin    = "Headset Mic",
+               .mask   = SND_JACK_MICROPHONE,
+       },
+};
+
+int asoc_sdw_es9356_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
+       int ret;
+
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                         "%s spk:es9356-spk",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_add_routes(dapm, es9356_spk_map,
+                                     ARRAY_SIZE(es9356_spk_map));
+       if (ret)
+               dev_err(card->dev, "es9356 map addition failed: %d\n", ret);
+
+       return ret;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_es9356_spk_rtd_init, "SND_SOC_SDW_UTILS");
+
+int asoc_sdw_es9356_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
+       int ret;
+
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                         "%s mic:es9356-dmic",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_add_routes(dapm, es9356_dmic_map,
+                                     ARRAY_SIZE(es9356_dmic_map));
+       if (ret)
+               dev_err(card->dev, "es9356 map addition failed: %d\n", ret);
+
+       return ret;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_es9356_dmic_rtd_init, "SND_SOC_SDW_UTILS");
+
+int asoc_sdw_es9356_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(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;
+
+       component = dai->component;
+       card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+                                         "%s hs:es9356",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       ret = snd_soc_dapm_add_routes(dapm, es9356_map,
+                                     ARRAY_SIZE(es9356_map));
+
+       if (ret) {
+               dev_err(card->dev, "es9356 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 | SND_JACK_BTN_4,
+                                        &ctx->sdw_headset,
+                                        es9356_jack_pins,
+                                        ARRAY_SIZE(es9356_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_VOLUMEUP);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_NEXTSONG);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_4, KEY_PREVIOUSSONG);
+
+       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_es9356_rtd_init, "SND_SOC_SDW_UTILS");
+
+int asoc_sdw_es9356_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;
+
+       device_remove_software_node(ctx->headset_codec_dev);
+       put_device(ctx->headset_codec_dev);
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_es9356_exit, "SND_SOC_SDW_UTILS");
+
+int asoc_sdw_es9356_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;
+
+       /*
+        * headset should be initialized once.
+        * Do it with dai link for playback.
+        */
+       if (!playback)
+               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 = es9356_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_es9356_init, "SND_SOC_SDW_UTILS");
+
+int asoc_sdw_es9356_amp_init(struct snd_soc_card *card,
+                      struct snd_soc_dai_link *dai_links,
+                      struct asoc_sdw_codec_info *info,
+                      bool playback)
+{
+       if (!playback)
+               return 0;
+
+       info->amp_num++;
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_es9356_amp_init, "SND_SOC_SDW_UTILS");