* [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs
@ 2026-02-23 6:50 Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 1/5] ASoC: dt-bindings: nvidia,tegra-audio: document CPCAP CODEC Svyatoslav Ryhel
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Svyatoslav Ryhel @ 2026-02-23 6:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Thierry Reding, Jonathan Hunter, Jaroslav Kysela,
Takashi Iwai, Svyatoslav Ryhel, Jonas Schwöbel
Cc: linux-sound, devicetree, linux-tegra, linux-kernel
Add support for WM8962 and CPCAP codecs found in various Tegra devices.
---
Changes in v2:
- fixed Kconfig dependencies
- added schema adjustments for max9808x
Changes in v3:
- in nvidia,tegra-audio-cpcap.yaml set vendor of device specific
compatible to motorola
- in nvidia,tegra-audio-cpcap.yaml in example adjusted compatible
to avoid confusion
---
Jonas Schwöbel (1):
ASoC: tegra: Support WM8962 by machine driver
Svyatoslav Ryhel (4):
ASoC: dt-bindings: nvidia,tegra-audio: document CPCAP CODEC
ASoC: tegra: Support CPCAP by machine driver
ASoC: dt-bindings: nvidia,tegra-audio: document WM8962 CODEC
ASoC: dt-bindings: nvidia,tegra-audio-max9808x: document additional
board pins
.../sound/nvidia,tegra-audio-cpcap.yaml | 90 ++++++++++
.../sound/nvidia,tegra-audio-max9808x.yaml | 5 +
.../sound/nvidia,tegra-audio-wm8962.yaml | 88 ++++++++++
sound/soc/tegra/Kconfig | 19 ++
sound/soc/tegra/Makefile | 2 +
sound/soc/tegra/tegra_asoc_machine.c | 52 ++++++
sound/soc/tegra/tegra_wm8962.c | 165 ++++++++++++++++++
7 files changed, 421 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-cpcap.yaml
create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8962.yaml
create mode 100644 sound/soc/tegra/tegra_wm8962.c
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/5] ASoC: dt-bindings: nvidia,tegra-audio: document CPCAP CODEC
2026-02-23 6:50 [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Svyatoslav Ryhel
@ 2026-02-23 6:50 ` Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 2/5] ASoC: tegra: Support CPCAP by machine driver Svyatoslav Ryhel
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Svyatoslav Ryhel @ 2026-02-23 6:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Thierry Reding, Jonathan Hunter, Jaroslav Kysela,
Takashi Iwai, Svyatoslav Ryhel, Jonas Schwöbel
Cc: linux-sound, devicetree, linux-tegra, linux-kernel
Add dt-binding for CPCAP CODEC.
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
---
.../sound/nvidia,tegra-audio-cpcap.yaml | 90 +++++++++++++++++++
1 file changed, 90 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-cpcap.yaml
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-cpcap.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-cpcap.yaml
new file mode 100644
index 000000000000..69af2022d0fa
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-cpcap.yaml
@@ -0,0 +1,90 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/nvidia,tegra-audio-cpcap.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NVIDIA Tegra audio complex with CPCAP CODEC
+
+maintainers:
+ - Svyatoslav Ryhel <clamor95@gmail.com>
+
+allOf:
+ - $ref: nvidia,tegra-audio-common.yaml#
+
+properties:
+ compatible:
+ items:
+ - pattern: '^motorola,tegra-audio-cpcap(-[a-z0-9]+)+$'
+ - const: nvidia,tegra-audio-cpcap
+
+ nvidia,audio-routing:
+ $ref: /schemas/types.yaml#/definitions/non-unique-string-array
+ description:
+ A list of the connections between audio components. Each entry is a
+ pair of strings, the first being the connection's sink, the second
+ being the connection's source. Valid names for sources and sinks are
+ the pins (documented in the binding document), and the jacks on the
+ board.
+ minItems: 2
+ items:
+ enum:
+ # Board Connectors
+ - Speakers
+ - Int Spk
+ - Earpiece
+ - Int Mic
+ - Headset Mic
+ - Internal Mic 1
+ - Internal Mic 2
+ - Headphone
+ - Headphones
+ - Headphone Jack
+ - Mic Jack
+
+ # CODEC Pins
+ - MICR
+ - HSMIC
+ - EMUMIC
+ - MICL
+ - EXTR
+ - EXTL
+ - EP
+ - SPKR
+ - SPKL
+ - LINER
+ - LINEL
+ - HSR
+ - HSL
+ - EMUR
+ - EMUL
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/tegra20-car.h>
+ #include <dt-bindings/soc/tegra-pmc.h>
+ sound {
+ compatible = "motorola,tegra-audio-cpcap-olympus",
+ "nvidia,tegra-audio-cpcap";
+ nvidia,model = "Motorola Atrix 4G (MB860) CPCAP";
+
+ nvidia,audio-routing =
+ "Headphones", "HSR",
+ "Headphones", "HSL",
+ "Int Spk", "SPKR",
+ "Int Spk", "SPKL",
+ "Earpiece", "EP",
+ "HSMIC", "Mic Jack",
+ "MICR", "Internal Mic 1",
+ "MICL", "Internal Mic 2";
+
+ nvidia,i2s-controller = <&tegra_i2s1>;
+ nvidia,audio-codec = <&cpcap_audio>;
+
+ clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
+ <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
+ <&tegra_car TEGRA20_CLK_CDEV1>;
+ clock-names = "pll_a", "pll_a_out0", "mclk";
+ };
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/5] ASoC: tegra: Support CPCAP by machine driver
2026-02-23 6:50 [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 1/5] ASoC: dt-bindings: nvidia,tegra-audio: document CPCAP CODEC Svyatoslav Ryhel
@ 2026-02-23 6:50 ` Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 3/5] ASoC: dt-bindings: nvidia,tegra-audio: document WM8962 CODEC Svyatoslav Ryhel
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Svyatoslav Ryhel @ 2026-02-23 6:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Thierry Reding, Jonathan Hunter, Jaroslav Kysela,
Takashi Iwai, Svyatoslav Ryhel, Jonas Schwöbel
Cc: linux-sound, devicetree, linux-tegra, linux-kernel
Add CPCAP codec support to the Tegra ASoC machine driver. This codec is
found in Motorola T20 devices like Atrix 4G and Droid X2.
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
---
sound/soc/tegra/Kconfig | 9 +++++
sound/soc/tegra/tegra_asoc_machine.c | 52 ++++++++++++++++++++++++++++
2 files changed, 61 insertions(+)
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 9dbd589879fb..dd58525b7079 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -294,6 +294,15 @@ config SND_SOC_TEGRA_SGTL5000
boards using the SGTL5000 codec, such as Apalis T30, Apalis TK1 or
Colibri T30.
+config SND_SOC_TEGRA_CPCAP
+ tristate "SoC Audio support for Tegra boards using a CPCAP codec"
+ depends on I2C && GPIOLIB && MFD_CPCAP
+ select SND_SOC_TEGRA_MACHINE_DRV
+ select SND_SOC_CPCAP
+ help
+ Say Y or M here if you want to add support for SoC audio on Tegra
+ boards using the CPCAP codec, such as Motorola Atrix 4G or Droid X2.
+
endif
endmenu
diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
index d48463ac16fc..10834f9c3422 100644
--- a/sound/soc/tegra/tegra_asoc_machine.c
+++ b/sound/soc/tegra/tegra_asoc_machine.c
@@ -287,6 +287,25 @@ static unsigned int tegra_machine_mclk_rate_6mhz(unsigned int srate)
return mclk;
}
+static unsigned int tegra_machine_mclk_rate_cpcap(unsigned int srate)
+{
+ unsigned int mclk;
+
+ switch (srate) {
+ case 11025:
+ case 22050:
+ case 44100:
+ case 88200:
+ mclk = 26000000;
+ break;
+ default:
+ mclk = 256 * srate;
+ break;
+ }
+
+ return mclk;
+}
+
static int tegra_machine_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
@@ -985,6 +1004,38 @@ static const struct tegra_asoc_data tegra_rt5631_data = {
.add_hp_jack = true,
};
+/* CPCAP machine */
+
+SND_SOC_DAILINK_DEFS(cpcap_hifi,
+ DAILINK_COMP_ARRAY(COMP_EMPTY()),
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "cpcap-hifi")),
+ DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+static struct snd_soc_dai_link tegra_cpcap_dai = {
+ .name = "CPCAP",
+ .stream_name = "CPCAP PCM",
+ .init = tegra_asoc_machine_init,
+ .dai_fmt = SND_SOC_DAIFMT_I2S |
+ SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBP_CFP,
+ SND_SOC_DAILINK_REG(cpcap_hifi),
+};
+
+static struct snd_soc_card snd_soc_tegra_cpcap = {
+ .components = "codec:cpcap",
+ .dai_link = &tegra_cpcap_dai,
+ .num_links = 1,
+ .fully_routed = true,
+};
+
+static const struct tegra_asoc_data tegra_cpcap_data = {
+ .mclk_rate = tegra_machine_mclk_rate_cpcap,
+ .card = &snd_soc_tegra_cpcap,
+ .add_common_dapm_widgets = true,
+ .add_common_controls = true,
+ .add_common_snd_ops = true,
+};
+
static const struct of_device_id tegra_machine_of_match[] = {
{ .compatible = "nvidia,tegra-audio-trimslice", .data = &tegra_trimslice_data },
{ .compatible = "nvidia,tegra-audio-max98090", .data = &tegra_max98090_data },
@@ -997,6 +1048,7 @@ static const struct of_device_id tegra_machine_of_match[] = {
{ .compatible = "nvidia,tegra-audio-rt5640", .data = &tegra_rt5640_data },
{ .compatible = "nvidia,tegra-audio-alc5632", .data = &tegra_rt5632_data },
{ .compatible = "nvidia,tegra-audio-rt5631", .data = &tegra_rt5631_data },
+ { .compatible = "nvidia,tegra-audio-cpcap", .data = &tegra_cpcap_data },
{},
};
MODULE_DEVICE_TABLE(of, tegra_machine_of_match);
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 3/5] ASoC: dt-bindings: nvidia,tegra-audio: document WM8962 CODEC
2026-02-23 6:50 [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 1/5] ASoC: dt-bindings: nvidia,tegra-audio: document CPCAP CODEC Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 2/5] ASoC: tegra: Support CPCAP by machine driver Svyatoslav Ryhel
@ 2026-02-23 6:50 ` Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 4/5] ASoC: tegra: Support WM8962 by machine driver Svyatoslav Ryhel
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Svyatoslav Ryhel @ 2026-02-23 6:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Thierry Reding, Jonathan Hunter, Jaroslav Kysela,
Takashi Iwai, Svyatoslav Ryhel, Jonas Schwöbel
Cc: linux-sound, devicetree, linux-tegra, linux-kernel
Add dt-binding for WM8962 CODEC.
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
---
.../sound/nvidia,tegra-audio-wm8962.yaml | 88 +++++++++++++++++++
1 file changed, 88 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8962.yaml
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8962.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8962.yaml
new file mode 100644
index 000000000000..2c3bf5a02a34
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8962.yaml
@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/nvidia,tegra-audio-wm8962.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: NVIDIA Tegra audio complex with WM8962 CODEC
+
+maintainers:
+ - Svyatoslav Ryhel <clamor95@gmail.com>
+
+allOf:
+ - $ref: nvidia,tegra-audio-common.yaml#
+
+properties:
+ compatible:
+ items:
+ - pattern: '^[a-z0-9]+,tegra-audio-wm8962(-[a-z0-9]+)+$'
+ - const: nvidia,tegra-audio-wm8962
+
+ nvidia,audio-routing:
+ $ref: /schemas/types.yaml#/definitions/non-unique-string-array
+ description:
+ A list of the connections between audio components. Each entry is a
+ pair of strings, the first being the connection's sink, the second
+ being the connection's source. Valid names for sources and sinks are
+ the pins (documented in the binding document), and the jacks on the
+ board.
+ minItems: 2
+ items:
+ enum:
+ # Board Connectors
+ - Speakers
+ - Int Spk
+ - Earpiece
+ - Int Mic
+ - Headset Mic
+ - Internal Mic 1
+ - Internal Mic 2
+ - Headphone
+ - Headphones
+ - Headphone Jack
+ - Mic Jack
+
+ # CODEC Pins
+ - IN1L
+ - IN1R
+ - IN2L
+ - IN2R
+ - IN3L
+ - IN3R
+ - IN4L
+ - IN4R
+ - DMICDAT
+ - HPOUTL
+ - HPOUTR
+ - SPKOUT
+ - SPKOUTL
+ - SPKOUTR
+
+required:
+ - nvidia,i2s-controller
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/clock/tegra30-car.h>
+ #include <dt-bindings/soc/tegra-pmc.h>
+ sound {
+ compatible = "microsoft,tegra-audio-wm8962-surface-rt",
+ "nvidia,tegra-audio-wm8962";
+ nvidia,model = "Microsoft Surface RT WM8962";
+
+ nvidia,audio-routing =
+ "Headphone Jack", "HPOUTR",
+ "Headphone Jack", "HPOUTL",
+ "Int Spk", "SPKOUTR",
+ "Int Spk", "SPKOUTL";
+
+ nvidia,i2s-controller = <&tegra_i2s1>;
+ nvidia,audio-codec = <&wm8962>;
+
+ clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
+ <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
+ <&tegra_pmc TEGRA_PMC_CLK_OUT_1>;
+ clock-names = "pll_a", "pll_a_out0", "mclk";
+ };
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 4/5] ASoC: tegra: Support WM8962 by machine driver
2026-02-23 6:50 [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Svyatoslav Ryhel
` (2 preceding siblings ...)
2026-02-23 6:50 ` [PATCH v3 3/5] ASoC: dt-bindings: nvidia,tegra-audio: document WM8962 CODEC Svyatoslav Ryhel
@ 2026-02-23 6:50 ` Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 5/5] ASoC: dt-bindings: nvidia,tegra-audio-max9808x: document additional board pins Svyatoslav Ryhel
2026-03-03 11:20 ` [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Mark Brown
5 siblings, 0 replies; 7+ messages in thread
From: Svyatoslav Ryhel @ 2026-02-23 6:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Thierry Reding, Jonathan Hunter, Jaroslav Kysela,
Takashi Iwai, Svyatoslav Ryhel, Jonas Schwöbel
Cc: linux-sound, devicetree, linux-tegra, linux-kernel
From: Jonas Schwöbel <jonasschwoebel@yahoo.de>
Add Wolfson Microelectronics WM8962 codec support to the Tegra ASoC
machine driver. The WM8962 codec is found on devices like Microsoft
Surface RT and Microsoft Surface 2 Windows RT based tablets.
Co-developed-by: Svyatoslav Ryhel <clamor95@gmail.com>
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
Signed-off-by: Jonas Schwöbel <jonasschwoebel@yahoo.de>
---
sound/soc/tegra/Kconfig | 10 ++
sound/soc/tegra/Makefile | 2 +
sound/soc/tegra/tegra_wm8962.c | 165 +++++++++++++++++++++++++++++++++
3 files changed, 177 insertions(+)
create mode 100644 sound/soc/tegra/tegra_wm8962.c
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index dd58525b7079..fdc954028d62 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -229,6 +229,16 @@ config SND_SOC_TEGRA_WM8903
boards using the WM8093 codec. Currently, the supported boards are
Harmony, Ventana, Seaboard, Kaen, and Aebl.
+config SND_SOC_TEGRA_WM8962
+ tristate "SoC Audio support for Tegra boards using a WM8962 codec"
+ depends on I2C && INPUT && GPIOLIB
+ select SND_SOC_TEGRA_MACHINE_DRV
+ select SND_SOC_WM8962
+ help
+ Say Y or M here if you want to add support for SoC audio on Tegra
+ boards using the WM8962 codec. Currently, the supported boards are
+ Microsoft Surface RT.
+
config SND_SOC_TEGRA_WM9712
tristate "SoC Audio support for Tegra boards using a WM9712 codec"
depends on GPIOLIB
diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
index defea7f53f11..3f396c87802e 100644
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -43,9 +43,11 @@ obj-$(CONFIG_SND_SOC_TEGRA210_OPE) += snd-soc-tegra210-ope.o
# Tegra machine Support
snd-soc-tegra-wm8903-y := tegra_wm8903.o
+snd-soc-tegra-wm8962-y := tegra_wm8962.o
snd-soc-tegra-machine-y := tegra_asoc_machine.o
snd-soc-tegra-audio-graph-card-y := tegra_audio_graph_card.o
obj-$(CONFIG_SND_SOC_TEGRA_WM8903) += snd-soc-tegra-wm8903.o
+obj-$(CONFIG_SND_SOC_TEGRA_WM8962) += snd-soc-tegra-wm8962.o
obj-$(CONFIG_SND_SOC_TEGRA_MACHINE_DRV) += snd-soc-tegra-machine.o
obj-$(CONFIG_SND_SOC_TEGRA_AUDIO_GRAPH_CARD) += snd-soc-tegra-audio-graph-card.o
diff --git a/sound/soc/tegra/tegra_wm8962.c b/sound/soc/tegra/tegra_wm8962.c
new file mode 100644
index 000000000000..31f9d9181595
--- /dev/null
+++ b/sound/soc/tegra/tegra_wm8962.c
@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * tegra_wm8962.c - Tegra machine ASoC driver for boards using WM8962 codec.
+ *
+ * Copyright (C) 2021-2024 Jonas Schwöbel <jonasschwoebel@yahoo.de>
+ * Svyatoslav Ryhel <clamor95@gmail.com>
+ *
+ * Based on tegra_wm8903 code copyright/by:
+ *
+ * Author: Stephen Warren <swarren@nvidia.com>
+ * Copyright (C) 2010-2012 - NVIDIA, Inc.
+ *
+ * Based on code copyright/by:
+ *
+ * (c) 2009, 2010 Nvidia Graphics Pvt. Ltd.
+ *
+ * Copyright 2007 Wolfson Microelectronics PLC.
+ * Author: Graeme Gregory
+ * graeme.gregory@wolfsonmicro.com or linux@wolfsonmicro.com
+ */
+
+#include <linux/gpio/consumer.h>
+#include <linux/of.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <sound/core.h>
+#include <sound/jack.h>
+#include <sound/soc.h>
+
+#include "../codecs/wm8962.h"
+
+#include "tegra_asoc_machine.h"
+
+static struct snd_soc_jack_pin tegra_wm8962_mic_jack_pins[] = {
+ { .pin = "Mic Jack", .mask = SND_JACK_MICROPHONE },
+};
+
+static unsigned int tegra_wm8962_mclk_rate(unsigned int srate)
+{
+ unsigned int mclk;
+
+ switch (srate) {
+ case 8000:
+ case 16000:
+ case 24000:
+ case 32000:
+ case 48000:
+ case 64000:
+ case 96000:
+ mclk = 12288000;
+ break;
+ case 11025:
+ case 22050:
+ case 44100:
+ case 88200:
+ mclk = 11289600;
+ break;
+ default:
+ mclk = 12000000;
+ break;
+ }
+
+ return mclk;
+}
+
+static int tegra_wm8962_init(struct snd_soc_pcm_runtime *rtd)
+{
+ struct tegra_machine *machine = snd_soc_card_get_drvdata(rtd->card);
+ struct snd_soc_card *card = rtd->card;
+ struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
+ int err;
+
+ err = tegra_asoc_machine_init(rtd);
+ if (err)
+ return err;
+
+ if (!machine->gpiod_mic_det && machine->asoc->add_mic_jack) {
+ struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+ struct snd_soc_component *component = codec_dai->component;
+
+ err = snd_soc_card_jack_new_pins(rtd->card, "Mic Jack",
+ SND_JACK_MICROPHONE,
+ machine->mic_jack,
+ tegra_wm8962_mic_jack_pins,
+ ARRAY_SIZE(tegra_wm8962_mic_jack_pins));
+ if (err) {
+ dev_err(rtd->dev, "Mic Jack creation failed: %d\n", err);
+ return err;
+ }
+
+ wm8962_mic_detect(component, machine->mic_jack);
+ }
+
+ snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");
+
+ return 0;
+}
+
+static int tegra_wm8962_remove(struct snd_soc_card *card)
+{
+ struct snd_soc_dai_link *link = &card->dai_link[0];
+ struct snd_soc_pcm_runtime *rtd = snd_soc_get_pcm_runtime(card, link);
+ struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+ struct snd_soc_component *component = codec_dai->component;
+
+ wm8962_mic_detect(component, NULL);
+
+ return 0;
+}
+
+SND_SOC_DAILINK_DEFS(wm8962_hifi,
+ DAILINK_COMP_ARRAY(COMP_EMPTY()),
+ DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "wm8962")),
+ DAILINK_COMP_ARRAY(COMP_EMPTY()));
+
+static struct snd_soc_dai_link tegra_wm8962_dai = {
+ .name = "WM8962",
+ .stream_name = "WM8962 PCM",
+ .init = tegra_wm8962_init,
+ .dai_fmt = SND_SOC_DAIFMT_I2S |
+ SND_SOC_DAIFMT_NB_NF |
+ SND_SOC_DAIFMT_CBC_CFC,
+ SND_SOC_DAILINK_REG(wm8962_hifi),
+};
+
+static struct snd_soc_card snd_soc_tegra_wm8962 = {
+ .components = "codec:wm8962",
+ .owner = THIS_MODULE,
+ .dai_link = &tegra_wm8962_dai,
+ .num_links = 1,
+ .remove = tegra_wm8962_remove,
+ .fully_routed = true,
+};
+
+static const struct tegra_asoc_data tegra_wm8962_data = {
+ .mclk_rate = tegra_wm8962_mclk_rate,
+ .card = &snd_soc_tegra_wm8962,
+ .add_common_dapm_widgets = true,
+ .add_common_controls = true,
+ .add_common_snd_ops = true,
+ .add_mic_jack = true,
+ .add_hp_jack = true,
+};
+
+static const struct of_device_id tegra_wm8962_of_match[] = {
+ { .compatible = "nvidia,tegra-audio-wm8962", .data = &tegra_wm8962_data },
+ {},
+};
+MODULE_DEVICE_TABLE(of, tegra_wm8962_of_match);
+
+static struct platform_driver tegra_wm8962_driver = {
+ .driver = {
+ .name = "tegra-wm8962",
+ .of_match_table = tegra_wm8962_of_match,
+ .pm = &snd_soc_pm_ops,
+ },
+ .probe = tegra_asoc_machine_probe,
+};
+module_platform_driver(tegra_wm8962_driver);
+
+MODULE_AUTHOR("Jonas Schwöbel <jonasschwoebel@yahoo.de>");
+MODULE_AUTHOR("Svyatoslav Ryhel <clamor95@gmail.com>");
+MODULE_DESCRIPTION("Tegra+WM8962 machine ASoC driver");
+MODULE_LICENSE("GPL");
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 5/5] ASoC: dt-bindings: nvidia,tegra-audio-max9808x: document additional board pins
2026-02-23 6:50 [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Svyatoslav Ryhel
` (3 preceding siblings ...)
2026-02-23 6:50 ` [PATCH v3 4/5] ASoC: tegra: Support WM8962 by machine driver Svyatoslav Ryhel
@ 2026-02-23 6:50 ` Svyatoslav Ryhel
2026-03-03 11:20 ` [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Mark Brown
5 siblings, 0 replies; 7+ messages in thread
From: Svyatoslav Ryhel @ 2026-02-23 6:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Thierry Reding, Jonathan Hunter, Jaroslav Kysela,
Takashi Iwai, Svyatoslav Ryhel, Jonas Schwöbel
Cc: linux-sound, devicetree, linux-tegra, linux-kernel
Document additional board pins that may be used in routing.
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
Acked-by: Rob Herring (Arm) <robh@kernel.org>
---
.../bindings/sound/nvidia,tegra-audio-max9808x.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml
index 241d20f3aad0..4957645a8e03 100644
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max9808x.yaml
@@ -35,10 +35,15 @@ properties:
items:
enum:
# Board Connectors
+ - Speakers
- Int Spk
+ - Headphone
+ - Headphones
- Headphone Jack
- Earpiece
- Headset Mic
+ - Mic Jack
+ - Int Mic
- Internal Mic 1
- Internal Mic 2
--
2.51.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs
2026-02-23 6:50 [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Svyatoslav Ryhel
` (4 preceding siblings ...)
2026-02-23 6:50 ` [PATCH v3 5/5] ASoC: dt-bindings: nvidia,tegra-audio-max9808x: document additional board pins Svyatoslav Ryhel
@ 2026-03-03 11:20 ` Mark Brown
5 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2026-03-03 11:20 UTC (permalink / raw)
To: Liam Girdwood, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Thierry Reding, Jonathan Hunter, Jaroslav Kysela, Takashi Iwai,
Jonas Schwöbel, Svyatoslav Ryhel
Cc: linux-sound, devicetree, linux-tegra, linux-kernel
On Mon, 23 Feb 2026 08:50:46 +0200, Svyatoslav Ryhel wrote:
> Add support for WM8962 and CPCAP codecs found in various Tegra devices.
>
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/5] ASoC: dt-bindings: nvidia,tegra-audio: document CPCAP CODEC
commit: d6b634cbc2eed73497877c95a7807d0f34fa4459
[2/5] ASoC: tegra: Support CPCAP by machine driver
commit: a34547b389a91bf0709f0901c3752ccaf63730cd
[3/5] ASoC: dt-bindings: nvidia,tegra-audio: document WM8962 CODEC
commit: 79d73f5a0b7a702a19189c1a237ae3728d88de59
[4/5] ASoC: tegra: Support WM8962 by machine driver
commit: 536ffa105e16ca3f6e7de53f9d6059f53d0207f7
[5/5] ASoC: dt-bindings: nvidia,tegra-audio-max9808x: document additional board pins
commit: 06dba254de95b16e7793224d29daa5195de2e581
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-03-03 11:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-23 6:50 [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 1/5] ASoC: dt-bindings: nvidia,tegra-audio: document CPCAP CODEC Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 2/5] ASoC: tegra: Support CPCAP by machine driver Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 3/5] ASoC: dt-bindings: nvidia,tegra-audio: document WM8962 CODEC Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 4/5] ASoC: tegra: Support WM8962 by machine driver Svyatoslav Ryhel
2026-02-23 6:50 ` [PATCH v3 5/5] ASoC: dt-bindings: nvidia,tegra-audio-max9808x: document additional board pins Svyatoslav Ryhel
2026-03-03 11:20 ` [PATCH v3 0/5] ASoC: tegra: Add support for WM8962 and CPCAP codecs Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®