Skip to contentSkip to conversation

ASoC/ARM: tegra: apalis/colibri t30: sgtl5000 audio

PATCH Superseded Marcel Ziswiler 3 participants 10 messages Sep 9, 2014 – Sep 10, 2014

Subsystems (5)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover ASoC/ARM: tegra: apalis/colibri t30: sgtl5000 audio

This series adds/integrates Freescale SGTL5000 analogue audio codec support.

Marcel Ziswiler (3):
ASoC: tegra: add tegra sgtl5000 machine driver
ARM: tegra: apalis/colibri t30: integrate audio support
ARM: tegra: enable sgtl5000 audio

 .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt |  45 +++++
 arch/arm/boot/dts/tegra30-apalis.dtsi              |  49 +++++
 arch/arm/boot/dts/tegra30-colibri.dtsi             |  49 +++++
 arch/arm/configs/tegra_defconfig                   |   1 +
 sound/soc/tegra/Kconfig                            |  10 +
 sound/soc/tegra/Makefile                           |   2 +
 sound/soc/tegra/tegra_sgtl5000.c                   | 216 +++++++++++++++++++++
 7 files changed, 372 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt
 create mode 100644 sound/soc/tegra/tegra_sgtl5000.c
Signature · 1 line
1.9.3
#1 lore raw

PATCH 1/3 ASoC: tegra: add tegra sgtl5000 machine driver

This binding and driver describe/support playback to headphones, and capture from line-in and microphone.

This driver is useful for the Toradex Apalis T30 and Colibri T30 modules.

---
 .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt |  45 +++++
 sound/soc/tegra/Kconfig                            |  10 +
 sound/soc/tegra/Makefile                           |   2 +
 sound/soc/tegra/tegra_sgtl5000.c                   | 216 +++++++++++++++++++++
 4 files changed, 273 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt
 create mode 100644 sound/soc/tegra/tegra_sgtl5000.c
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt new file +45 -0
new file mode 100644
index 0000000..22f8499
@@ -0,0 +1,45 @@
+NVIDIA Tegra audio complex, with SGTL5000 CODEC
+
+Required properties:
+- compatible : "nvidia,tegra-audio-sgtl5000"
+- clocks : Must contain an entry for each entry in clock-names.
+  See ../clocks/clock-bindings.txt for details.
+- clock-names : Must include the following entries:
+  - pll_a
+  - pll_a_out0
+  - mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
+- nvidia,model : The user-visible name of this sound complex.
+- nvidia,audio-routing : 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 SGTL5000's pins (as documented in its binding), and the jacks
+  on the board:
+
+  * Headphones
+  * Line-in Jack
+  * Mic Jack
+
+- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
+  connected to the CODEC.
+- nvidia,audio-codec : The phandle of the SGTL5000 audio codec.
+
+Example:
+
+sound {
+	compatible = "toradex,tegra-audio-sgtl5000-apalis_t30",
+		     "nvidia,tegra-audio-sgtl5000";
+	nvidia,model = "Toradex Apalis T30";
+
+	nvidia,audio-routing =
+		"Headphone Jack", "HP_OUT",
+		"LINE_IN", "Line In Jack",
+		"MIC_IN", "Mic Jack";
+
+	nvidia,i2s-controller = <&tegra_i2s2>;
+	nvidia,audio-codec = <&sgtl5000>;
+
+	clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
+		 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
+		 <&tegra_car TEGRA30_CLK_EXTERN1>;
+	clock-names = "pll_a", "pll_a_out0", "mclk";
+};
sound/soc/tegra/Kconfig +10 -0
index 31198cf7..001dec8 100644
@@ -128,3 +128,13 @@ config SND_SOC_TEGRA_MAX98090
 	help
 	  Say Y or M here if you want to add support for SoC audio on Tegra
 	  boards using the MAX98090 codec, such as Venice2.
+
+config SND_SOC_TEGRA_SGTL5000
+	tristate "SoC Audio support for Tegra boards using a SGTL5000 codec"
+	depends on SND_SOC_TEGRA && I2C && GPIOLIB
+	select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
+	select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
+	select SND_SOC_SGTL5000
+	help
+	  Say Y or M here if you want to add support for SoC audio on Tegra
+	  boards using the SGTL5000 codec, such as Apalis/Colibri T30.
sound/soc/tegra/Makefile +2 -0
index 5ae588c..a0c70f8 100644
@@ -25,6 +25,7 @@ snd-soc-tegra-wm9712-objs := tegra_wm9712.o
 snd-soc-tegra-trimslice-objs := trimslice.o
 snd-soc-tegra-alc5632-objs := tegra_alc5632.o
 snd-soc-tegra-max98090-objs := tegra_max98090.o
+snd-soc-tegra-sgtl5000-objs := tegra_sgtl5000.o
 
 obj-$(CONFIG_SND_SOC_TEGRA_RT5640) += snd-soc-tegra-rt5640.o
 obj-$(CONFIG_SND_SOC_TEGRA_WM8753) += snd-soc-tegra-wm8753.o
@@ -33,3 +34,4 @@ obj-$(CONFIG_SND_SOC_TEGRA_WM9712) += snd-soc-tegra-wm9712.o
 obj-$(CONFIG_SND_SOC_TEGRA_TRIMSLICE) += snd-soc-tegra-trimslice.o
 obj-$(CONFIG_SND_SOC_TEGRA_ALC5632) += snd-soc-tegra-alc5632.o
 obj-$(CONFIG_SND_SOC_TEGRA_MAX98090) += snd-soc-tegra-max98090.o
+obj-$(CONFIG_SND_SOC_TEGRA_SGTL5000) += snd-soc-tegra-sgtl5000.o
sound/soc/tegra/tegra_sgtl5000.c new file +216 -0

216 lines not on this page · raw message

Signature · 1 line
1.9.3
#2 lore raw

Re: [PATCH 1/3] ASoC: tegra: add tegra sgtl5000 machine driver

Quoted 11 lines · Marcel Ziswiler

This binding and driver describe/support playback to headphones, and capture from line-in and microphone.

This driver is useful for the Toradex Apalis T30 and Colibri T30 modules.

---
 .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt |  45 +++++
 sound/soc/tegra/Kconfig                            |  10 +
 sound/soc/tegra/Makefile                           |   2 +
 sound/soc/tegra/tegra_sgtl5000.c                   | 216 +++++++++++++++++++++

What about using the simple-audio-card binding instead of adding the tegra_sgtl5000 machine driver?

An example of simple-audio-card used with sgtl5000 can be found here:

http://www.spinics.net/lists/devicetree/msg44466.html

#3 lore raw

Re: [PATCH 1/3] ASoC: tegra: add tegra sgtl5000 machine driver

Quoted 13 lines · Fabio Estevam
Quoted 11 lines · Marcel Ziswiler

This binding and driver describe/support playback to headphones, and capture from line-in and microphone.

This driver is useful for the Toradex Apalis T30 and Colibri T30 modules.

---
  .../bindings/sound/nvidia,tegra-audio-sgtl5000.txt |  45 +++++
  sound/soc/tegra/Kconfig                            |  10 +
  sound/soc/tegra/Makefile                           |   2 +
  sound/soc/tegra/tegra_sgtl5000.c                   | 216 +++++++++++++++++++++
Quoted 6 lines

What about using the simple-audio-card binding instead of adding the tegra_sgtl5000 machine driver?

An example of simple-audio-card used with sgtl5000 can be found here:

http://www.spinics.net/lists/devicetree/msg44466.html

I don't think that will work; the Tegra audio complex requires some clock management that doesn't immediately seem to fit into the simple-audio-card concept.

I had intended to refactor and collapse all the Tegra DT audio bindings (and driver code) into a single instance so we didn't need to keep adding more and more. However, I unfortunately never got around to that and probably won't in the future either. Basically, the binding and code would end up essentially identical to any of the current Tegra drivers (or the union of them), with a few tweaks such as only creating e.g. a headphone jack if a property in DT said to, and moving the sampling frequency -> CODEC MCLK table out of the driver into a table in DT. I think with those things parameterized in DT, we could get away with a single "nvidia,tegra-audio-simple" binding and driver. Such a new binding could be based on simple-audio-card with extensions though.

#4 lore raw

Re: [PATCH 1/3] ASoC: tegra: add tegra sgtl5000 machine driver

Quoted 3 lines · Stephen Warren

I don't think that will work; the Tegra audio complex requires some clock management that doesn't immediately seem to fit into the simple-audio-card concept.

Could you elaborate on that one? At least for our use case it seems to work just fine. See v2 following ASAP.

#5 lore raw

Re: [PATCH 1/3] ASoC: tegra: add tegra sgtl5000 machine driver

In reply to Fabio Estevam
Quoted 2 lines · Fabio Estevam

What about using the simple-audio-card binding instead of adding the tegra_sgtl5000 machine driver?

Good question. I have to admit last I checked on the current state of affairs on vybrid towards end of last year none of this existed yet. Sweet. Will try and resubmit v2 with that in mind.

Quoted 3 lines

An example of simple-audio-card used with sgtl5000 can be found here:

http://www.spinics.net/lists/devicetree/msg44466.html

While above linked example does not quite look like a proper example thereof I do get the point. Please excuse my ignorance.

#7 lore raw

PATCH 2/3 ARM: tegra: apalis/colibri t30: integrate audio support

In reply to Marcel Ziswiler

Integrate Freescale SGTL5000 analogue audio codec support.

---
 arch/arm/boot/dts/tegra30-apalis.dtsi  | 49 ++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/tegra30-colibri.dtsi | 49 ++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
arch/arm/boot/dts/tegra30-apalis.dtsi +49 -0
index a5446cb..9fe3e4d 100644
@@ -47,6 +47,24 @@
 		pinctrl-0 = <&state_default>;
 
 		state_default: pinmux {
+			/* Apalis Analogue Audio */
+			clk1_out_pw4 {
+				nvidia,pins = "clk1_out_pw4";
+				nvidia,function = "extperiph1";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+				nvidia,enable-input = <TEGRA_PIN_DISABLE>;
+			};
+			dap3_fs_pp0 {
+				nvidia,pins =	"dap3_fs_pp0",
+						"dap3_sclk_pp3",
+						"dap3_din_pp1",
+						"dap3_dout_pp2";
+				nvidia,function = "i2s2";
+				nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+				nvidia,tristate = <TEGRA_PIN_DISABLE>;
+			};
+
 			/* Apalis BKL1_ON */
 			pv2 {
 				nvidia,pins = "pv2";
@@ -404,6 +422,15 @@
 		status = "okay";
 		clock-frequency = <100000>;
 
+		/* SGTL5000 audio codec */
+		sgtl5000: codec@0a {
+			compatible = "fsl,sgtl5000";
+			reg = <0x0a>;
+			VDDA-supply = <&sys_3v3_reg>;
+			VDDIO-supply = <&sys_3v3_reg>;
+			clocks = <&tegra_car TEGRA30_CLK_EXTERN1>;
+		};
+
 		pmic: tps65911@2d {
 			compatible = "ti,tps65911";
 			reg = <0x2d>;
@@ -635,6 +662,12 @@
 		nvidia,sys-clock-req-active-high;
 	};
 
+	ahub@70080000 {
+		i2s@70080500 {
+			status = "okay";
+		};
+	};
+
 	sdhci@78000600 {
 		status = "okay";
 		bus-width = <8>;
@@ -684,4 +717,20 @@
 			regulator-always-on;
 		};
 	};
+
+	sound {
+		compatible = "toradex,tegra-audio-sgtl5000-apalis_t30",
+			     "nvidia,tegra-audio-sgtl5000";
+		nvidia,model = "Toradex Apalis T30";
+		nvidia,audio-routing =
+			"Headphone Jack", "HP_OUT",
+			"LINE_IN", "Line In Jack",
+			"MIC_IN", "Mic Jack";
+		nvidia,i2s-controller = <&tegra_i2s2>;
+		nvidia,audio-codec = <&sgtl5000>;
+		clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
+			 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
+			 <&tegra_car TEGRA30_CLK_EXTERN1>;
+		clock-names = "pll_a", "pll_a_out0", "mclk";
+	};
 };
arch/arm/boot/dts/tegra30-colibri.dtsi +49 -0

71 lines not on this page · raw message

Signature · 1 line
1.9.3
#8 lore raw

Re: [PATCH 2/3] ARM: tegra: apalis/colibri t30: integrate audio support

Quoted 1 line · Marcel Ziswiler

Integrate Freescale SGTL5000 analogue audio codec support.

Patches 2 and 3 look OK. I'll hold off applying them until patch 1 is applied, just to make sure that the new DT binding there is accepted before I apply patches using it. If you could ping me when the patch is applied, that'd be very useful. Thanks.

#9 lore raw

PATCH 3/3 ARM: tegra: enable sgtl5000 audio

In reply to Marcel Ziswiler

The NVIDIA Tegra 3 based Apalis T30 and Colibri T30 modules contain a Freescale SGTL5000 analogue audio codec.

---
 arch/arm/configs/tegra_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/tegra_defconfig +1 -0
index 77d6e94..02233d1 100644
@@ -210,6 +210,7 @@ CONFIG_SND_SOC_TEGRA_WM8903=y
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
 CONFIG_SND_SOC_TEGRA_ALC5632=y
 CONFIG_SND_SOC_TEGRA_MAX98090=y
+CONFIG_SND_SOC_TEGRA_SGTL5000=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
Signature · 1 line
1.9.3