Skip to content

Commit 4233b65

Browse files
okiasdigetx
okias
authored and
digetx
committed
Revert "dt-bindings: sound: nvidia,tegra-audio: Convert multiple txt bindings to yaml"
This reverts commit f715e54.
1 parent 3b8ab42 commit 4233b65

10 files changed

+445
-190
lines changed

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
NVIDIA Tegra audio complex
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-alc5632"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
See ../clocks/clock-bindings.txt for details.
7+
- clock-names : Must include the following entries:
8+
- pll_a
9+
- pll_a_out0
10+
- mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
11+
- nvidia,model : The user-visible name of this sound complex.
12+
- nvidia,audio-routing : A list of the connections between audio components.
13+
Each entry is a pair of strings, the first being the connection's sink,
14+
the second being the connection's source. Valid names for sources and
15+
sinks are the ALC5632's pins as documented in the binding for the device
16+
and:
17+
18+
* Headset Stereophone
19+
* Int Spk
20+
* Headset Mic
21+
* Digital Mic
22+
23+
- nvidia,i2s-controller : The phandle of the Tegra I2S controller
24+
- nvidia,audio-codec : The phandle of the ALC5632 audio codec
25+
26+
Example:
27+
28+
sound {
29+
compatible = "nvidia,tegra-audio-alc5632-paz00",
30+
"nvidia,tegra-audio-alc5632";
31+
32+
nvidia,model = "Compal PAZ00";
33+
34+
nvidia,audio-routing =
35+
"Int Spk", "SPK_OUTP",
36+
"Int Spk", "SPK_OUTN",
37+
"Headset Mic","MICBIAS1",
38+
"MIC1_N", "Headset Mic",
39+
"MIC1_P", "Headset Mic",
40+
"Headset Stereophone", "HP_OUT_R",
41+
"Headset Stereophone", "HP_OUT_L";
42+
43+
nvidia,i2s-controller = <&tegra_i2s1>;
44+
nvidia,audio-codec = <&alc5632>;
45+
46+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
47+
clock-names = "pll_a", "pll_a_out0", "mclk";
48+
};

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
NVIDIA Tegra audio complex, with MAX98090 CODEC
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-max98090"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
See ../clocks/clock-bindings.txt for details.
7+
- clock-names : Must include the following entries:
8+
- pll_a
9+
- pll_a_out0
10+
- mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
11+
- nvidia,model : The user-visible name of this sound complex.
12+
- nvidia,audio-routing : A list of the connections between audio components.
13+
Each entry is a pair of strings, the first being the connection's sink,
14+
the second being the connection's source. Valid names for sources and
15+
sinks are the MAX98090's pins (as documented in its binding), and the jacks
16+
on the board:
17+
18+
* Headphones
19+
* Speakers
20+
* Mic Jack
21+
* Int Mic
22+
23+
- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
24+
connected to the CODEC.
25+
- nvidia,audio-codec : The phandle of the MAX98090 audio codec.
26+
27+
Optional properties:
28+
- nvidia,hp-det-gpios : The GPIO that detect headphones are plugged in
29+
- nvidia,mic-det-gpios : The GPIO that detect microphones are plugged in
30+
31+
Example:
32+
33+
sound {
34+
compatible = "nvidia,tegra-audio-max98090-venice2",
35+
"nvidia,tegra-audio-max98090";
36+
nvidia,model = "NVIDIA Tegra Venice2";
37+
38+
nvidia,audio-routing =
39+
"Headphones", "HPR",
40+
"Headphones", "HPL",
41+
"Speakers", "SPKR",
42+
"Speakers", "SPKL",
43+
"Mic Jack", "MICBIAS",
44+
"IN34", "Mic Jack";
45+
46+
nvidia,i2s-controller = <&tegra_i2s1>;
47+
nvidia,audio-codec = <&acodec>;
48+
49+
clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
50+
<&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
51+
<&tegra_car TEGRA124_CLK_EXTERN1>;
52+
clock-names = "pll_a", "pll_a_out0", "mclk";
53+
};

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
NVIDIA Tegra audio complex, with RT5640 CODEC
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-rt5640"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
See ../clocks/clock-bindings.txt for details.
7+
- clock-names : Must include the following entries:
8+
- pll_a
9+
- pll_a_out0
10+
- mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
11+
- nvidia,model : The user-visible name of this sound complex.
12+
- nvidia,audio-routing : A list of the connections between audio components.
13+
Each entry is a pair of strings, the first being the connection's sink,
14+
the second being the connection's source. Valid names for sources and
15+
sinks are the RT5640's pins (as documented in its binding), and the jacks
16+
on the board:
17+
18+
* Headphones
19+
* Speakers
20+
* Mic Jack
21+
22+
- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
23+
connected to the CODEC.
24+
- nvidia,audio-codec : The phandle of the RT5640 audio codec. This binding
25+
assumes that AIF1 on the CODEC is connected to Tegra.
26+
27+
Optional properties:
28+
- nvidia,hp-det-gpios : The GPIO that detects headphones are plugged in
29+
30+
Example:
31+
32+
sound {
33+
compatible = "nvidia,tegra-audio-rt5640-dalmore",
34+
"nvidia,tegra-audio-rt5640";
35+
nvidia,model = "NVIDIA Tegra Dalmore";
36+
37+
nvidia,audio-routing =
38+
"Headphones", "HPOR",
39+
"Headphones", "HPOL",
40+
"Speakers", "SPORP",
41+
"Speakers", "SPORN",
42+
"Speakers", "SPOLP",
43+
"Speakers", "SPOLN";
44+
45+
nvidia,i2s-controller = <&tegra_i2s1>;
46+
nvidia,audio-codec = <&rt5640>;
47+
48+
nvidia,hp-det-gpios = <&gpio 143 0>; /* GPIO PR7 */
49+
50+
clocks = <&tegra_car 216>, <&tegra_car 217>, <&tegra_car 120>;
51+
clock-names = "pll_a", "pll_a_out0", "mclk";
52+
};

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
NVIDIA Tegra audio complex, with RT5677 CODEC
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-rt5677"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
See ../clocks/clock-bindings.txt for details.
7+
- clock-names : Must include the following entries:
8+
- pll_a
9+
- pll_a_out0
10+
- mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
11+
- nvidia,model : The user-visible name of this sound complex.
12+
- nvidia,audio-routing : A list of the connections between audio components.
13+
Each entry is a pair of strings, the first being the connection's sink,
14+
the second being the connection's source. Valid names for sources and
15+
sinks are the RT5677's pins (as documented in its binding), and the jacks
16+
on the board:
17+
18+
* Headphone
19+
* Speaker
20+
* Headset Mic
21+
* Internal Mic 1
22+
* Internal Mic 2
23+
24+
- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
25+
connected to the CODEC.
26+
- nvidia,audio-codec : The phandle of the RT5677 audio codec. This binding
27+
assumes that AIF1 on the CODEC is connected to Tegra.
28+
29+
Optional properties:
30+
- nvidia,hp-det-gpios : The GPIO that detects headphones are plugged in
31+
- nvidia,hp-en-gpios : The GPIO that enables headphone amplifier
32+
- nvidia,mic-present-gpios: The GPIO that mic jack is plugged in
33+
- nvidia,dmic-clk-en-gpios : The GPIO that gates DMIC clock signal
34+
35+
Example:
36+
37+
sound {
38+
compatible = "nvidia,tegra-audio-rt5677-ryu",
39+
"nvidia,tegra-audio-rt5677";
40+
nvidia,model = "NVIDIA Tegra Ryu";
41+
42+
nvidia,audio-routing =
43+
"Headphone", "LOUT2",
44+
"Headphone", "LOUT1",
45+
"Headset Mic", "MICBIAS1",
46+
"IN1P", "Headset Mic",
47+
"IN1N", "Headset Mic",
48+
"DMIC L1", "Internal Mic 1",
49+
"DMIC R1", "Internal Mic 1",
50+
"DMIC L2", "Internal Mic 2",
51+
"DMIC R2", "Internal Mic 2",
52+
"Speaker", "PDM1L",
53+
"Speaker", "PDM1R";
54+
55+
nvidia,i2s-controller = <&tegra_i2s1>;
56+
nvidia,audio-codec = <&rt5677>;
57+
58+
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
59+
nvidia,mic-present-gpios = <&gpio TEGRA_GPIO(O, 5) GPIO_ACTIVE_LOW>;
60+
nvidia,hp-en-gpios = <&rt5677 1 GPIO_ACTIVE_HIGH>;
61+
nvidia,dmic-clk-en-gpios = <&rt5677 2 GPIO_ACTIVE_HIGH>;
62+
63+
clocks = <&tegra_car TEGRA124_CLK_PLL_A>,
64+
<&tegra_car TEGRA124_CLK_PLL_A_OUT0>,
65+
<&tegra_car TEGRA124_CLK_EXTERN1>;
66+
clock-names = "pll_a", "pll_a_out0", "mclk";
67+
};

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
NVIDIA Tegra audio complex, with SGTL5000 CODEC
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-sgtl5000"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
See ../clocks/clock-bindings.txt for details.
7+
- clock-names : Must include the following entries:
8+
- pll_a
9+
- pll_a_out0
10+
- mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
11+
- nvidia,model : The user-visible name of this sound complex.
12+
- nvidia,audio-routing : A list of the connections between audio components.
13+
Each entry is a pair of strings, the first being the connection's sink,
14+
the second being the connection's source. Valid names for sources and
15+
sinks are the SGTL5000's pins (as documented in its binding), and the jacks
16+
on the board:
17+
18+
* Headphone Jack
19+
* Line In Jack
20+
* Mic Jack
21+
22+
- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
23+
connected to the CODEC.
24+
- nvidia,audio-codec : The phandle of the SGTL5000 audio codec.
25+
26+
Example:
27+
28+
sound {
29+
compatible = "toradex,tegra-audio-sgtl5000-apalis_t30",
30+
"nvidia,tegra-audio-sgtl5000";
31+
nvidia,model = "Toradex Apalis T30";
32+
nvidia,audio-routing =
33+
"Headphone Jack", "HP_OUT",
34+
"LINE_IN", "Line In Jack",
35+
"MIC_IN", "Mic Jack";
36+
nvidia,i2s-controller = <&tegra_i2s2>;
37+
nvidia,audio-codec = <&sgtl5000>;
38+
clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
39+
<&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
40+
<&tegra_car TEGRA30_CLK_EXTERN1>;
41+
clock-names = "pll_a", "pll_a_out0", "mclk";
42+
};

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
NVIDIA Tegra audio complex for TrimSlice
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-trimslice"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
- clock-names : Must include the following entries:
7+
"pll_a" (The Tegra clock of that name),
8+
"pll_a_out0" (The Tegra clock of that name),
9+
"mclk" (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
10+
- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller
11+
- nvidia,audio-codec : The phandle of the WM8903 audio codec
12+
13+
Example:
14+
15+
sound {
16+
compatible = "nvidia,tegra-audio-trimslice";
17+
nvidia,i2s-controller = <&tegra_i2s1>;
18+
nvidia,audio-codec = <&codec>;
19+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
20+
clock-names = "pll_a", "pll_a_out0", "mclk";
21+
};

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
NVIDIA Tegra audio complex
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-wm8753"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
See ../clocks/clock-bindings.txt for details.
7+
- clock-names : Must include the following entries:
8+
- pll_a
9+
- pll_a_out0
10+
- mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
11+
- nvidia,model : The user-visible name of this sound complex.
12+
- nvidia,audio-routing : A list of the connections between audio components.
13+
Each entry is a pair of strings, the first being the connection's sink,
14+
the second being the connection's source. Valid names for sources and
15+
sinks are the WM8753's pins as documented in the binding for the WM8753,
16+
and the jacks on the board:
17+
18+
* Headphone Jack
19+
* Mic Jack
20+
21+
- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller
22+
- nvidia,audio-codec : The phandle of the WM8753 audio codec
23+
Example:
24+
25+
sound {
26+
compatible = "nvidia,tegra-audio-wm8753-whistler",
27+
"nvidia,tegra-audio-wm8753"
28+
nvidia,model = "tegra-wm8753-harmony";
29+
30+
nvidia,audio-routing =
31+
"Headphone Jack", "LOUT1",
32+
"Headphone Jack", "ROUT1";
33+
34+
nvidia,i2s-controller = <&i2s1>;
35+
nvidia,audio-codec = <&wm8753>;
36+
37+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
38+
clock-names = "pll_a", "pll_a_out0", "mclk";
39+
};
40+

‎Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
NVIDIA Tegra audio complex
2+
3+
Required properties:
4+
- compatible : "nvidia,tegra-audio-wm8903"
5+
- clocks : Must contain an entry for each entry in clock-names.
6+
See ../clocks/clock-bindings.txt for details.
7+
- clock-names : Must include the following entries:
8+
- pll_a
9+
- pll_a_out0
10+
- mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)
11+
- nvidia,model : The user-visible name of this sound complex.
12+
- nvidia,audio-routing : A list of the connections between audio components.
13+
Each entry is a pair of strings, the first being the connection's sink,
14+
the second being the connection's source. Valid names for sources and
15+
sinks are the WM8903's pins (documented in the WM8903 binding document),
16+
and the jacks on the board:
17+
18+
* Headphone Jack
19+
* Int Spk
20+
* Mic Jack
21+
* Int Mic
22+
23+
- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller
24+
- nvidia,audio-codec : The phandle of the WM8903 audio codec
25+
26+
Optional properties:
27+
- nvidia,spkr-en-gpios : The GPIO that enables the speakers
28+
- nvidia,hp-mute-gpios : The GPIO that mutes the headphones
29+
- nvidia,hp-det-gpios : The GPIO that detect headphones are plugged in
30+
- nvidia,int-mic-en-gpios : The GPIO that enables the internal microphone
31+
- nvidia,ext-mic-en-gpios : The GPIO that enables the external microphone
32+
- nvidia,headset : The Mic Jack represents state of the headset microphone pin
33+
34+
Example:
35+
36+
sound {
37+
compatible = "nvidia,tegra-audio-wm8903-harmony",
38+
"nvidia,tegra-audio-wm8903"
39+
nvidia,model = "tegra-wm8903-harmony";
40+
41+
nvidia,audio-routing =
42+
"Headphone Jack", "HPOUTR",
43+
"Headphone Jack", "HPOUTL",
44+
"Int Spk", "ROP",
45+
"Int Spk", "RON",
46+
"Int Spk", "LOP",
47+
"Int Spk", "LON",
48+
"Mic Jack", "MICBIAS",
49+
"IN1L", "Mic Jack";
50+
51+
nvidia,i2s-controller = <&i2s1>;
52+
nvidia,audio-codec = <&wm8903>;
53+
54+
nvidia,spkr-en-gpios = <&codec 2 0>;
55+
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
56+
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
57+
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
58+
59+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
60+
clock-names = "pll_a", "pll_a_out0", "mclk";
61+
};
62+

0 commit comments

Comments
 (0)