ASoC: soc_sdw_utils: Add device info for CS47L47

Add a device info entry for the Cirrus Logic CS47L47.

CS47L47 has UAJ (headset speaker + mic + jack detect) and DMICs.
The audio ports are similar to the CS42L45 so can be based on the
CS42L45 code.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20260223150256.326143-3-rf@opensource.cirrus.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 227347c8f0b336b23ba929c182896859809dd724..98531e500cbb398155e2ee0a4de5a7d0b41e1690 100644 (file)
--- a/include/sound/soc_sdw_utils.h
+++ b/include/sound/soc_sdw_utils.h
@@ -259,6 +259,8 @@ int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_so
 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_cs47l47_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
+int asoc_sdw_cs47l47_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 */

diff --git a/sound/soc/sdw_utils/Makefile b/sound/soc/sdw_utils/Makefile
index e8bd5ffb1a6ade72b10af357756f1bf242e5456f..a8d091fd374b6ee18255bccaf6e66de8a03c9516 100644 (file)
--- a/sound/soc/sdw_utils/Makefile
+++ b/sound/soc/sdw_utils/Makefile
@@ -6,6 +6,7 @@ snd-soc-sdw-utils-y := soc_sdw_utils.o soc_sdw_dmic.o soc_sdw_rt_dmic.o \
                       soc_sdw_bridge_cs35l56.o                         \
                       soc_sdw_cs42l42.o soc_sdw_cs42l43.o              \
                       soc_sdw_cs42l45.o                                \
+                      soc_sdw_cs47l47.o                                \
                       soc_sdw_cs_amp.o                                 \
                       soc_sdw_maxim.o \
                       soc_sdw_ti_amp.o

diff --git a/sound/soc/sdw_utils/soc_sdw_cs47l47.c b/sound/soc/sdw_utils/soc_sdw_cs47l47.c
new file mode 100644 (file)
index 0000000..259ecf1
--- /dev/null
+++ b/sound/soc/sdw_utils/soc_sdw_cs47l47.c
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// Based on sof_sdw_cs42l45.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_cs47l47 - Helpers to handle CS47L47 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    = "cs47l47 OT 43 Headphone",
+               .mask   = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin    = "cs47l47 OT 45 Headset",
+               .mask   = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin    = "cs47l47 IT 31 Microphone",
+               .mask   = SND_JACK_MICROPHONE,
+       },
+       {
+               .pin    = "cs47l47 IT 33 Headset",
+               .mask   = SND_JACK_MICROPHONE,
+       },
+};
+
+int asoc_sdw_cs47l47_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:cs47l47",
+                                         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_cs47l47_hs_rtd_init, "SND_SOC_SDW_UTILS");
+
+int asoc_sdw_cs47l47_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:cs47l47-dmic",
+                                         card->components);
+       if (!card->components)
+               return -ENOMEM;
+
+       return 0;
+}
+EXPORT_SYMBOL_NS(asoc_sdw_cs47l47_dmic_rtd_init, "SND_SOC_SDW_UTILS");

diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index 0e67d9f34cba395605dc9c8b2dd43ab252e207d6..eeeb91dded9dab372588a5db988c42189e16f462 100644 (file)
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -759,6 +759,42 @@ struct asoc_sdw_codec_info codec_info_list[] = {
                },
                .aux_num = 1,
        },
+       {
+               .part_id = 0x4747,
+               .name_prefix = "cs47l47",
+               .dais = {
+                       {
+                               .direction = {true, false},
+                               .codec_name = "snd_soc_sdca.UAJ.1",
+                               .dai_name = "IT 41",
+                               .dai_type = SOC_SDW_DAI_TYPE_JACK,
+                               .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
+                               .rtd_init = asoc_sdw_cs47l47_hs_rtd_init,
+                       },
+                       {
+                               .direction = {false, true},
+                               .codec_name = "snd_soc_sdca.SmartMic.0",
+                               .dai_name = "OT 113",
+                               .dai_type = SOC_SDW_DAI_TYPE_MIC,
+                               .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
+                               .rtd_init = asoc_sdw_cs47l47_dmic_rtd_init,
+                       },
+                       {
+                               .direction = {false, true},
+                               .codec_name = "snd_soc_sdca.UAJ.1",
+                               .dai_name = "OT 36",
+                               .dai_type = SOC_SDW_DAI_TYPE_JACK,
+                               .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
+                       },
+               },
+               .dai_num = 3,
+               .auxs = {
+                       {
+                               .codec_name = "snd_soc_sdca.HID.2",
+                       },
+               },
+               .aux_num = 1,
+       },
        {
                .part_id = 0xaaaa, /* generic codec mockup */
                .name_prefix = "sdw_mockup_mmulti-function",