tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ARM: tegra: add clocks property to sound nodes
Audio-related clocks need to be represented in the device tree. Update
bindings to describe which clocks are needed, and DT files to include
those clocks.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
+61
+8
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
+8
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
···
2
2
3
3
Required properties:
4
4
- compatible : "nvidia,tegra-audio-alc5632"
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)
5
10
- nvidia,model : The user-visible name of this sound complex.
6
11
- nvidia,audio-routing : A list of the connections between audio components.
7
12
Each entry is a pair of strings, the first being the connection's sink,
···
61
56
62
57
nvidia,i2s-controller = <&tegra_i2s1>;
63
58
nvidia,audio-codec = <&alc5632>;
59
+
60
+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
61
+
clock-names = "pll_a", "pll_a_out0", "mclk";
64
62
};
+7
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
+7
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt
···
2
2
3
3
Required properties:
4
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)
5
10
- nvidia,i2s-controller : The phandle of the Tegra I2S1 controller
6
11
- nvidia,audio-codec : The phandle of the WM8903 audio codec
7
12
···
16
11
compatible = "nvidia,tegra-audio-trimslice";
17
12
nvidia,i2s-controller = <&tegra_i2s1>;
18
13
nvidia,audio-codec = <&codec>;
14
+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
15
+
clock-names = "pll_a", "pll_a_out0", "mclk";
19
16
};
+8
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
+8
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
···
2
2
3
3
Required properties:
4
4
- compatible : "nvidia,tegra-audio-wm8753"
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)
5
10
- nvidia,model : The user-visible name of this sound complex.
6
11
- nvidia,audio-routing : A list of the connections between audio components.
7
12
Each entry is a pair of strings, the first being the connection's sink,
···
55
50
56
51
nvidia,i2s-controller = <&i2s1>;
57
52
nvidia,audio-codec = <&wm8753>;
53
+
54
+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
55
+
clock-names = "pll_a", "pll_a_out0", "mclk";
58
56
};
59
57
+8
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
+8
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
···
2
2
3
3
Required properties:
4
4
- compatible : "nvidia,tegra-audio-wm8903"
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)
5
10
- nvidia,model : The user-visible name of this sound complex.
6
11
- nvidia,audio-routing : A list of the connections between audio components.
7
12
Each entry is a pair of strings, the first being the connection's sink,
···
72
67
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
73
68
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
74
69
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
70
+
71
+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
72
+
clock-names = "pll_a", "pll_a_out0", "mclk";
75
73
};
76
74
+3
arch/arm/boot/dts/tegra20-harmony.dts
+3
arch/arm/boot/dts/tegra20-harmony.dts
···
669
669
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
670
670
nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */
671
671
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
672
+
673
+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
674
+
clock-names = "pll_a", "pll_a_out0", "mclk";
672
675
};
673
676
};
+3
arch/arm/boot/dts/tegra20-medcom-wide.dts
+3
arch/arm/boot/dts/tegra20-medcom-wide.dts
+3
arch/arm/boot/dts/tegra20-paz00.dts
+3
arch/arm/boot/dts/tegra20-paz00.dts
+3
arch/arm/boot/dts/tegra20-plutux.dts
+3
arch/arm/boot/dts/tegra20-plutux.dts
+3
arch/arm/boot/dts/tegra20-seaboard.dts
+3
arch/arm/boot/dts/tegra20-seaboard.dts
+3
arch/arm/boot/dts/tegra20-tec.dts
+3
arch/arm/boot/dts/tegra20-tec.dts
+3
arch/arm/boot/dts/tegra20-trimslice.dts
+3
arch/arm/boot/dts/tegra20-trimslice.dts
+3
arch/arm/boot/dts/tegra20-ventana.dts
+3
arch/arm/boot/dts/tegra20-ventana.dts
···
620
620
nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */
621
621
nvidia,int-mic-en-gpios = <&gpio 184 0>; /* gpio PX0 */
622
622
nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */
623
+
624
+
clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>;
625
+
clock-names = "pll_a", "pll_a_out0", "mclk";
623
626
};
624
627
};
+3
arch/arm/boot/dts/tegra20-whistler.dts
+3
arch/arm/boot/dts/tegra20-whistler.dts
+3
arch/arm/boot/dts/tegra30-cardhu.dtsi
+3
arch/arm/boot/dts/tegra30-cardhu.dtsi