aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/gpu
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-11-06 16:00:25 -0500
committerStephen Warren <swarren@nvidia.com>2013-12-11 18:41:55 -0500
commitd8f64797c5ff3351a54830bba2cbc7e0b00e4613 (patch)
tree6df5a7b5c0fe9effa08aef6df00d8d8dc6b08014 /Documentation/devicetree/bindings/gpu
parente9827d9be9777cf287dd1340e6e7a8526f9e0b70 (diff)
ARM: tegra: add missing clock documentation to DT bindings
Many of the Tegra DT binding documents say nothing about the clocks or clock-names properties, yet those are present and required in DT files. This patch simply updates the documentation file to match the implicit definition of the binding, based on real-world DT content. All Tegra bindings that mention clocks are updated to have consistent wording and formatting of the clock-related properties. Signed-off-by: Stephen Warren <swarren@nvidia.com> Acked-By: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'Documentation/devicetree/bindings/gpu')
-rw-r--r--Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt59
1 files changed, 59 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
index b4fa934ae3a2..8b4367f86b95 100644
--- a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
+++ b/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
@@ -9,6 +9,8 @@ Required properties:
9- #size-cells: The number of cells used to represent the size of an address 9- #size-cells: The number of cells used to represent the size of an address
10 range in the host1x address space. Should be 1. 10 range in the host1x address space. Should be 1.
11- ranges: The mapping of the host1x address space to the CPU address space. 11- ranges: The mapping of the host1x address space to the CPU address space.
12- clocks: Must contain one entry, for the module clock.
13 See ../clocks/clock-bindings.txt for details.
12 14
13The host1x top-level node defines a number of children, each representing one 15The host1x top-level node defines a number of children, each representing one
14of the following host1x client modules: 16of the following host1x client modules:
@@ -19,6 +21,8 @@ of the following host1x client modules:
19 - compatible: "nvidia,tegra<chip>-mpe" 21 - compatible: "nvidia,tegra<chip>-mpe"
20 - reg: Physical base address and length of the controller's registers. 22 - reg: Physical base address and length of the controller's registers.
21 - interrupts: The interrupt outputs from the controller. 23 - interrupts: The interrupt outputs from the controller.
24 - clocks: Must contain one entry, for the module clock.
25 See ../clocks/clock-bindings.txt for details.
22 26
23- vi: video input 27- vi: video input
24 28
@@ -26,6 +30,8 @@ of the following host1x client modules:
26 - compatible: "nvidia,tegra<chip>-vi" 30 - compatible: "nvidia,tegra<chip>-vi"
27 - reg: Physical base address and length of the controller's registers. 31 - reg: Physical base address and length of the controller's registers.
28 - interrupts: The interrupt outputs from the controller. 32 - interrupts: The interrupt outputs from the controller.
33 - clocks: Must contain one entry, for the module clock.
34 See ../clocks/clock-bindings.txt for details.
29 35
30- epp: encoder pre-processor 36- epp: encoder pre-processor
31 37
@@ -33,6 +39,8 @@ of the following host1x client modules:
33 - compatible: "nvidia,tegra<chip>-epp" 39 - compatible: "nvidia,tegra<chip>-epp"
34 - reg: Physical base address and length of the controller's registers. 40 - reg: Physical base address and length of the controller's registers.
35 - interrupts: The interrupt outputs from the controller. 41 - interrupts: The interrupt outputs from the controller.
42 - clocks: Must contain one entry, for the module clock.
43 See ../clocks/clock-bindings.txt for details.
36 44
37- isp: image signal processor 45- isp: image signal processor
38 46
@@ -40,6 +48,8 @@ of the following host1x client modules:
40 - compatible: "nvidia,tegra<chip>-isp" 48 - compatible: "nvidia,tegra<chip>-isp"
41 - reg: Physical base address and length of the controller's registers. 49 - reg: Physical base address and length of the controller's registers.
42 - interrupts: The interrupt outputs from the controller. 50 - interrupts: The interrupt outputs from the controller.
51 - clocks: Must contain one entry, for the module clock.
52 See ../clocks/clock-bindings.txt for details.
43 53
44- gr2d: 2D graphics engine 54- gr2d: 2D graphics engine
45 55
@@ -47,12 +57,21 @@ of the following host1x client modules:
47 - compatible: "nvidia,tegra<chip>-gr2d" 57 - compatible: "nvidia,tegra<chip>-gr2d"
48 - reg: Physical base address and length of the controller's registers. 58 - reg: Physical base address and length of the controller's registers.
49 - interrupts: The interrupt outputs from the controller. 59 - interrupts: The interrupt outputs from the controller.
60 - clocks: Must contain one entry, for the module clock.
61 See ../clocks/clock-bindings.txt for details.
50 62
51- gr3d: 3D graphics engine 63- gr3d: 3D graphics engine
52 64
53 Required properties: 65 Required properties:
54 - compatible: "nvidia,tegra<chip>-gr3d" 66 - compatible: "nvidia,tegra<chip>-gr3d"
55 - reg: Physical base address and length of the controller's registers. 67 - reg: Physical base address and length of the controller's registers.
68 - clocks: Must contain an entry for each entry in clock-names.
69 See ../clocks/clock-bindings.txt for details.
70 - clock-names: Must include the following entries:
71 (This property may be omitted if the only clock in the list is "3d")
72 - 3d
73 This MUST be the first entry.
74 - 3d2 (Only required on SoCs with two 3D clocks)
56 75
57- dc: display controller 76- dc: display controller
58 77
@@ -60,6 +79,12 @@ of the following host1x client modules:
60 - compatible: "nvidia,tegra<chip>-dc" 79 - compatible: "nvidia,tegra<chip>-dc"
61 - reg: Physical base address and length of the controller's registers. 80 - reg: Physical base address and length of the controller's registers.
62 - interrupts: The interrupt outputs from the controller. 81 - interrupts: The interrupt outputs from the controller.
82 - clocks: Must contain an entry for each entry in clock-names.
83 See ../clocks/clock-bindings.txt for details.
84 - clock-names: Must include the following entries:
85 - dc
86 This MUST be the first entry.
87 - parent
63 88
64 Each display controller node has a child node, named "rgb", that represents 89 Each display controller node has a child node, named "rgb", that represents
65 the RGB output associated with the controller. It can take the following 90 the RGB output associated with the controller. It can take the following
@@ -76,6 +101,12 @@ of the following host1x client modules:
76 - interrupts: The interrupt outputs from the controller. 101 - interrupts: The interrupt outputs from the controller.
77 - vdd-supply: regulator for supply voltage 102 - vdd-supply: regulator for supply voltage
78 - pll-supply: regulator for PLL 103 - pll-supply: regulator for PLL
104 - clocks: Must contain an entry for each entry in clock-names.
105 See ../clocks/clock-bindings.txt for details.
106 - clock-names: Must include the following entries:
107 - hdmi
108 This MUST be the first entry.
109 - parent
79 110
80 Optional properties: 111 Optional properties:
81 - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing 112 - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing
@@ -88,12 +119,20 @@ of the following host1x client modules:
88 - compatible: "nvidia,tegra<chip>-tvo" 119 - compatible: "nvidia,tegra<chip>-tvo"
89 - reg: Physical base address and length of the controller's registers. 120 - reg: Physical base address and length of the controller's registers.
90 - interrupts: The interrupt outputs from the controller. 121 - interrupts: The interrupt outputs from the controller.
122 - clocks: Must contain one entry, for the module clock.
123 See ../clocks/clock-bindings.txt for details.
91 124
92- dsi: display serial interface 125- dsi: display serial interface
93 126
94 Required properties: 127 Required properties:
95 - compatible: "nvidia,tegra<chip>-dsi" 128 - compatible: "nvidia,tegra<chip>-dsi"
96 - reg: Physical base address and length of the controller's registers. 129 - reg: Physical base address and length of the controller's registers.
130 - clocks: Must contain an entry for each entry in clock-names.
131 See ../clocks/clock-bindings.txt for details.
132 - clock-names: Must include the following entries:
133 - dsi
134 This MUST be the first entry.
135 - parent
97 136
98Example: 137Example:
99 138
@@ -105,6 +144,7 @@ Example:
105 reg = <0x50000000 0x00024000>; 144 reg = <0x50000000 0x00024000>;
106 interrupts = <0 65 0x04 /* mpcore syncpt */ 145 interrupts = <0 65 0x04 /* mpcore syncpt */
107 0 67 0x04>; /* mpcore general */ 146 0 67 0x04>; /* mpcore general */
147 clocks = <&tegra_car TEGRA20_CLK_HOST1X>;
108 148
109 #address-cells = <1>; 149 #address-cells = <1>;
110 #size-cells = <1>; 150 #size-cells = <1>;
@@ -115,41 +155,50 @@ Example:
115 compatible = "nvidia,tegra20-mpe"; 155 compatible = "nvidia,tegra20-mpe";
116 reg = <0x54040000 0x00040000>; 156 reg = <0x54040000 0x00040000>;
117 interrupts = <0 68 0x04>; 157 interrupts = <0 68 0x04>;
158 clocks = <&tegra_car TEGRA20_CLK_MPE>;
118 }; 159 };
119 160
120 vi { 161 vi {
121 compatible = "nvidia,tegra20-vi"; 162 compatible = "nvidia,tegra20-vi";
122 reg = <0x54080000 0x00040000>; 163 reg = <0x54080000 0x00040000>;
123 interrupts = <0 69 0x04>; 164 interrupts = <0 69 0x04>;
165 clocks = <&tegra_car TEGRA20_CLK_VI>;
124 }; 166 };
125 167
126 epp { 168 epp {
127 compatible = "nvidia,tegra20-epp"; 169 compatible = "nvidia,tegra20-epp";
128 reg = <0x540c0000 0x00040000>; 170 reg = <0x540c0000 0x00040000>;
129 interrupts = <0 70 0x04>; 171 interrupts = <0 70 0x04>;
172 clocks = <&tegra_car TEGRA20_CLK_EPP>;
130 }; 173 };
131 174
132 isp { 175 isp {
133 compatible = "nvidia,tegra20-isp"; 176 compatible = "nvidia,tegra20-isp";
134 reg = <0x54100000 0x00040000>; 177 reg = <0x54100000 0x00040000>;
135 interrupts = <0 71 0x04>; 178 interrupts = <0 71 0x04>;
179 clocks = <&tegra_car TEGRA20_CLK_ISP>;
136 }; 180 };
137 181
138 gr2d { 182 gr2d {
139 compatible = "nvidia,tegra20-gr2d"; 183 compatible = "nvidia,tegra20-gr2d";
140 reg = <0x54140000 0x00040000>; 184 reg = <0x54140000 0x00040000>;
141 interrupts = <0 72 0x04>; 185 interrupts = <0 72 0x04>;
186 clocks = <&tegra_car TEGRA20_CLK_GR2D>;
142 }; 187 };
143 188
144 gr3d { 189 gr3d {
145 compatible = "nvidia,tegra20-gr3d"; 190 compatible = "nvidia,tegra20-gr3d";
146 reg = <0x54180000 0x00040000>; 191 reg = <0x54180000 0x00040000>;
192 clocks = <&tegra_car TEGRA20_CLK_GR3D>;
147 }; 193 };
148 194
149 dc@54200000 { 195 dc@54200000 {
150 compatible = "nvidia,tegra20-dc"; 196 compatible = "nvidia,tegra20-dc";
151 reg = <0x54200000 0x00040000>; 197 reg = <0x54200000 0x00040000>;
152 interrupts = <0 73 0x04>; 198 interrupts = <0 73 0x04>;
199 clocks = <&tegra_car TEGRA20_CLK_DISP1>,
200 <&tegra_car TEGRA20_CLK_PLL_P>;
201 clock-names = "disp1", "parent";
153 202
154 rgb { 203 rgb {
155 status = "disabled"; 204 status = "disabled";
@@ -160,6 +209,9 @@ Example:
160 compatible = "nvidia,tegra20-dc"; 209 compatible = "nvidia,tegra20-dc";
161 reg = <0x54240000 0x00040000>; 210 reg = <0x54240000 0x00040000>;
162 interrupts = <0 74 0x04>; 211 interrupts = <0 74 0x04>;
212 clocks = <&tegra_car TEGRA20_CLK_DISP2>,
213 <&tegra_car TEGRA20_CLK_PLL_P>;
214 clock-names = "disp2", "parent";
163 215
164 rgb { 216 rgb {
165 status = "disabled"; 217 status = "disabled";
@@ -170,6 +222,9 @@ Example:
170 compatible = "nvidia,tegra20-hdmi"; 222 compatible = "nvidia,tegra20-hdmi";
171 reg = <0x54280000 0x00040000>; 223 reg = <0x54280000 0x00040000>;
172 interrupts = <0 75 0x04>; 224 interrupts = <0 75 0x04>;
225 clocks = <&tegra_car TEGRA20_CLK_HDMI>,
226 <&tegra_car TEGRA20_CLK_PLL_D_OUT0>;
227 clock-names = "hdmi", "parent";
173 status = "disabled"; 228 status = "disabled";
174 }; 229 };
175 230
@@ -177,12 +232,16 @@ Example:
177 compatible = "nvidia,tegra20-tvo"; 232 compatible = "nvidia,tegra20-tvo";
178 reg = <0x542c0000 0x00040000>; 233 reg = <0x542c0000 0x00040000>;
179 interrupts = <0 76 0x04>; 234 interrupts = <0 76 0x04>;
235 clocks = <&tegra_car TEGRA20_CLK_TVO>;
180 status = "disabled"; 236 status = "disabled";
181 }; 237 };
182 238
183 dsi { 239 dsi {
184 compatible = "nvidia,tegra20-dsi"; 240 compatible = "nvidia,tegra20-dsi";
185 reg = <0x54300000 0x00040000>; 241 reg = <0x54300000 0x00040000>;
242 clocks = <&tegra_car TEGRA20_CLK_DSI>,
243 <&tegra_car TEGRA20_CLK_PLL_D_OUT0>;
244 clock-names = "dsi", "parent";
186 status = "disabled"; 245 status = "disabled";
187 }; 246 };
188 }; 247 };