diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-03-26 18:45:52 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-04-04 19:17:42 -0400 |
commit | f9cd2b3bf48b108c7935fa06e833e85b5f1d0119 (patch) | |
tree | bb1008cee5171646f7f017321fd50213527e872c /Documentation/devicetree | |
parent | fcf0b3a6c21c8bcd4c2943f8f9d49e66b7236c9b (diff) |
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>
Diffstat (limited to 'Documentation/devicetree')
4 files changed, 31 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt index b77a97c9101e..05ffecb57103 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt | |||
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex | |||
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : "nvidia,tegra-audio-alc5632" | 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 | - nvidia,model : The user-visible name of this sound complex. | 10 | - nvidia,model : The user-visible name of this sound complex. |
6 | - nvidia,audio-routing : A list of the connections between audio components. | 11 | - nvidia,audio-routing : A list of the connections between audio components. |
7 | Each entry is a pair of strings, the first being the connection's sink, | 12 | Each entry is a pair of strings, the first being the connection's sink, |
@@ -56,4 +61,7 @@ sound { | |||
56 | 61 | ||
57 | nvidia,i2s-controller = <&tegra_i2s1>; | 62 | nvidia,i2s-controller = <&tegra_i2s1>; |
58 | nvidia,audio-codec = <&alc5632>; | 63 | nvidia,audio-codec = <&alc5632>; |
64 | |||
65 | clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; | ||
66 | clock-names = "pll_a", "pll_a_out0", "mclk"; | ||
59 | }; | 67 | }; |
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt index 04b14cfb1f16..ef1fe7358279 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt | |||
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex for TrimSlice | |||
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : "nvidia,tegra-audio-trimslice" | 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 | - nvidia,i2s-controller : The phandle of the Tegra I2S1 controller | 10 | - nvidia,i2s-controller : The phandle of the Tegra I2S1 controller |
6 | - nvidia,audio-codec : The phandle of the WM8903 audio codec | 11 | - nvidia,audio-codec : The phandle of the WM8903 audio codec |
7 | 12 | ||
@@ -11,4 +16,6 @@ sound { | |||
11 | compatible = "nvidia,tegra-audio-trimslice"; | 16 | compatible = "nvidia,tegra-audio-trimslice"; |
12 | nvidia,i2s-controller = <&tegra_i2s1>; | 17 | nvidia,i2s-controller = <&tegra_i2s1>; |
13 | nvidia,audio-codec = <&codec>; | 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"; | ||
14 | }; | 21 | }; |
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt index c4dd39ce6165..d14510613a7f 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt | |||
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex | |||
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : "nvidia,tegra-audio-wm8753" | 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 | - nvidia,model : The user-visible name of this sound complex. | 10 | - nvidia,model : The user-visible name of this sound complex. |
6 | - nvidia,audio-routing : A list of the connections between audio components. | 11 | - nvidia,audio-routing : A list of the connections between audio components. |
7 | Each entry is a pair of strings, the first being the connection's sink, | 12 | Each entry is a pair of strings, the first being the connection's sink, |
@@ -50,5 +55,8 @@ sound { | |||
50 | 55 | ||
51 | nvidia,i2s-controller = <&i2s1>; | 56 | nvidia,i2s-controller = <&i2s1>; |
52 | nvidia,audio-codec = <&wm8753>; | 57 | nvidia,audio-codec = <&wm8753>; |
58 | |||
59 | clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; | ||
60 | clock-names = "pll_a", "pll_a_out0", "mclk"; | ||
53 | }; | 61 | }; |
54 | 62 | ||
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt index d5b0da8bf1d8..3bf722deb722 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt | |||
@@ -2,6 +2,11 @@ NVIDIA Tegra audio complex | |||
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible : "nvidia,tegra-audio-wm8903" | 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 | - nvidia,model : The user-visible name of this sound complex. | 10 | - nvidia,model : The user-visible name of this sound complex. |
6 | - nvidia,audio-routing : A list of the connections between audio components. | 11 | - nvidia,audio-routing : A list of the connections between audio components. |
7 | Each entry is a pair of strings, the first being the connection's sink, | 12 | Each entry is a pair of strings, the first being the connection's sink, |
@@ -67,5 +72,8 @@ sound { | |||
67 | nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ | 72 | nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ |
68 | nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */ | 73 | nvidia,int-mic-en-gpios = <&gpio 184 0>; /*gpio PX0 */ |
69 | nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ | 74 | nvidia,ext-mic-en-gpios = <&gpio 185 0>; /* gpio PX1 */ |
75 | |||
76 | clocks = <&tegra_car 112>, <&tegra_car 113>, <&tegra_car 93>; | ||
77 | clock-names = "pll_a", "pll_a_out0", "mclk"; | ||
70 | }; | 78 | }; |
71 | 79 | ||