diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-05-11 19:32:56 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-05-14 12:55:23 -0400 |
commit | 2a5fdc9adde8476751b63a795e3d66ae2ee3979d (patch) | |
tree | 6321e80d6c925469d94e09eab6f13b68dc9d963f | |
parent | 2eaab06ea6cc2d686fd1a6de62b1094bedc4cfca (diff) |
ARM: dt: tegra: invert status=disable vs status=okay
In tegra*.dtsi, set status="disable" for all HW modules that the board
design may choose not to use. Update all boards to specifically enable
any of those modules that are useful by setting status="okay".
This makes board files say which features they do use, rather than which
they don't, which feels more logical. It also makes the .dts files
slightly smaller, at least for existing content.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/boot/dts/tegra-cardhu.dts | 48 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-harmony.dts | 40 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-paz00.dts | 44 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 37 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-trimslice.dts | 37 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-ventana.dts | 40 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 18 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 19 |
8 files changed, 123 insertions, 160 deletions
diff --git a/arch/arm/boot/dts/tegra-cardhu.dts b/arch/arm/boot/dts/tegra-cardhu.dts index 3b5cd7b07553..e14bb450c328 100644 --- a/arch/arm/boot/dts/tegra-cardhu.dts +++ b/arch/arm/boot/dts/tegra-cardhu.dts | |||
@@ -64,34 +64,22 @@ | |||
64 | }; | 64 | }; |
65 | 65 | ||
66 | serial@70006000 { | 66 | serial@70006000 { |
67 | status = "okay"; | ||
67 | clock-frequency = <408000000>; | 68 | clock-frequency = <408000000>; |
68 | }; | 69 | }; |
69 | 70 | ||
70 | serial@70006040 { | ||
71 | status = "disable"; | ||
72 | }; | ||
73 | |||
74 | serial@70006200 { | ||
75 | status = "disable"; | ||
76 | }; | ||
77 | |||
78 | serial@70006300 { | ||
79 | status = "disable"; | ||
80 | }; | ||
81 | |||
82 | serial@70006400 { | ||
83 | status = "disable"; | ||
84 | }; | ||
85 | |||
86 | i2c@7000c000 { | 71 | i2c@7000c000 { |
72 | status = "okay"; | ||
87 | clock-frequency = <100000>; | 73 | clock-frequency = <100000>; |
88 | }; | 74 | }; |
89 | 75 | ||
90 | i2c@7000c400 { | 76 | i2c@7000c400 { |
77 | status = "okay"; | ||
91 | clock-frequency = <100000>; | 78 | clock-frequency = <100000>; |
92 | }; | 79 | }; |
93 | 80 | ||
94 | i2c@7000c500 { | 81 | i2c@7000c500 { |
82 | status = "okay"; | ||
95 | clock-frequency = <100000>; | 83 | clock-frequency = <100000>; |
96 | 84 | ||
97 | /* ALS and Proximity sensor */ | 85 | /* ALS and Proximity sensor */ |
@@ -104,10 +92,12 @@ | |||
104 | }; | 92 | }; |
105 | 93 | ||
106 | i2c@7000c700 { | 94 | i2c@7000c700 { |
95 | status = "okay"; | ||
107 | clock-frequency = <100000>; | 96 | clock-frequency = <100000>; |
108 | }; | 97 | }; |
109 | 98 | ||
110 | i2c@7000d000 { | 99 | i2c@7000d000 { |
100 | status = "okay"; | ||
111 | clock-frequency = <100000>; | 101 | clock-frequency = <100000>; |
112 | 102 | ||
113 | wm8903: wm8903@1a { | 103 | wm8903: wm8903@1a { |
@@ -139,38 +129,20 @@ | |||
139 | }; | 129 | }; |
140 | 130 | ||
141 | ahub { | 131 | ahub { |
142 | i2s@70080300 { | 132 | i2s@70080400 { |
143 | status = "disable"; | 133 | status = "okay"; |
144 | }; | ||
145 | |||
146 | i2s@70080500 { | ||
147 | status = "disable"; | ||
148 | }; | ||
149 | |||
150 | i2s@70080600 { | ||
151 | status = "disable"; | ||
152 | }; | ||
153 | |||
154 | i2s@70080700 { | ||
155 | status = "disable"; | ||
156 | }; | 134 | }; |
157 | }; | 135 | }; |
158 | 136 | ||
159 | sdhci@78000000 { | 137 | sdhci@78000000 { |
138 | status = "okay"; | ||
160 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 139 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
161 | wp-gpios = <&gpio 155 0>; /* gpio PT3 */ | 140 | wp-gpios = <&gpio 155 0>; /* gpio PT3 */ |
162 | power-gpios = <&gpio 31 0>; /* gpio PD7 */ | 141 | power-gpios = <&gpio 31 0>; /* gpio PD7 */ |
163 | }; | 142 | }; |
164 | 143 | ||
165 | sdhci@78000200 { | ||
166 | status = "disable"; | ||
167 | }; | ||
168 | |||
169 | sdhci@78000400 { | ||
170 | status = "disable"; | ||
171 | }; | ||
172 | |||
173 | sdhci@78000600 { | 144 | sdhci@78000600 { |
145 | status = "okay"; | ||
174 | support-8bit; | 146 | support-8bit; |
175 | }; | 147 | }; |
176 | 148 | ||
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index f18385d36dde..6bcdad34d2e7 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts | |||
@@ -234,31 +234,17 @@ | |||
234 | }; | 234 | }; |
235 | }; | 235 | }; |
236 | 236 | ||
237 | i2s@70002a00 { | 237 | i2s@70002800 { |
238 | status = "disable"; | 238 | status = "okay"; |
239 | }; | ||
240 | |||
241 | serial@70006000 { | ||
242 | status = "disable"; | ||
243 | }; | ||
244 | |||
245 | serial@70006040 { | ||
246 | status = "disable"; | ||
247 | }; | ||
248 | |||
249 | serial@70006200 { | ||
250 | status = "disable"; | ||
251 | }; | 239 | }; |
252 | 240 | ||
253 | serial@70006300 { | 241 | serial@70006300 { |
242 | status = "okay"; | ||
254 | clock-frequency = <216000000>; | 243 | clock-frequency = <216000000>; |
255 | }; | 244 | }; |
256 | 245 | ||
257 | serial@70006400 { | ||
258 | status = "disable"; | ||
259 | }; | ||
260 | |||
261 | i2c@7000c000 { | 246 | i2c@7000c000 { |
247 | status = "okay"; | ||
262 | clock-frequency = <400000>; | 248 | clock-frequency = <400000>; |
263 | 249 | ||
264 | wm8903: wm8903@1a { | 250 | wm8903: wm8903@1a { |
@@ -277,14 +263,17 @@ | |||
277 | }; | 263 | }; |
278 | 264 | ||
279 | i2c@7000c400 { | 265 | i2c@7000c400 { |
266 | status = "okay"; | ||
280 | clock-frequency = <400000>; | 267 | clock-frequency = <400000>; |
281 | }; | 268 | }; |
282 | 269 | ||
283 | i2c@7000c500 { | 270 | i2c@7000c500 { |
271 | status = "okay"; | ||
284 | clock-frequency = <400000>; | 272 | clock-frequency = <400000>; |
285 | }; | 273 | }; |
286 | 274 | ||
287 | i2c@7000d000 { | 275 | i2c@7000d000 { |
276 | status = "okay"; | ||
288 | clock-frequency = <400000>; | 277 | clock-frequency = <400000>; |
289 | }; | 278 | }; |
290 | 279 | ||
@@ -292,25 +281,28 @@ | |||
292 | nvidia,invert-interrupt; | 281 | nvidia,invert-interrupt; |
293 | }; | 282 | }; |
294 | 283 | ||
284 | usb@c5000000 { | ||
285 | status = "okay"; | ||
286 | }; | ||
287 | |||
295 | usb@c5004000 { | 288 | usb@c5004000 { |
289 | status = "okay"; | ||
296 | nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ | 290 | nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ |
297 | }; | 291 | }; |
298 | 292 | ||
299 | sdhci@c8000000 { | 293 | usb@c5008000 { |
300 | status = "disable"; | 294 | status = "okay"; |
301 | }; | 295 | }; |
302 | 296 | ||
303 | sdhci@c8000200 { | 297 | sdhci@c8000200 { |
298 | status = "okay"; | ||
304 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 299 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
305 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 300 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
306 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ | 301 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ |
307 | }; | 302 | }; |
308 | 303 | ||
309 | sdhci@c8000400 { | ||
310 | status = "disable"; | ||
311 | }; | ||
312 | |||
313 | sdhci@c8000600 { | 304 | sdhci@c8000600 { |
305 | status = "okay"; | ||
314 | cd-gpios = <&gpio 58 0>; /* gpio PH2 */ | 306 | cd-gpios = <&gpio 58 0>; /* gpio PH2 */ |
315 | wp-gpios = <&gpio 59 0>; /* gpio PH3 */ | 307 | wp-gpios = <&gpio 59 0>; /* gpio PH3 */ |
316 | power-gpios = <&gpio 70 0>; /* gpio PI6 */ | 308 | power-gpios = <&gpio 70 0>; /* gpio PI6 */ |
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 6539e8934802..cb366f0c6ffe 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts | |||
@@ -226,31 +226,22 @@ | |||
226 | }; | 226 | }; |
227 | }; | 227 | }; |
228 | 228 | ||
229 | i2s@70002a00 { | 229 | i2s@70002800 { |
230 | status = "disable"; | 230 | status = "okay"; |
231 | }; | 231 | }; |
232 | 232 | ||
233 | serial@70006000 { | 233 | serial@70006000 { |
234 | status = "okay"; | ||
234 | clock-frequency = <216000000>; | 235 | clock-frequency = <216000000>; |
235 | }; | 236 | }; |
236 | 237 | ||
237 | serial@70006040 { | ||
238 | status = "disable"; | ||
239 | }; | ||
240 | |||
241 | serial@70006200 { | 238 | serial@70006200 { |
239 | status = "okay"; | ||
242 | clock-frequency = <216000000>; | 240 | clock-frequency = <216000000>; |
243 | }; | 241 | }; |
244 | 242 | ||
245 | serial@70006300 { | ||
246 | status = "disable"; | ||
247 | }; | ||
248 | |||
249 | serial@70006400 { | ||
250 | status = "disable"; | ||
251 | }; | ||
252 | |||
253 | i2c@7000c000 { | 243 | i2c@7000c000 { |
244 | status = "okay"; | ||
254 | clock-frequency = <400000>; | 245 | clock-frequency = <400000>; |
255 | 246 | ||
256 | alc5632: alc5632@1e { | 247 | alc5632: alc5632@1e { |
@@ -262,13 +253,10 @@ | |||
262 | }; | 253 | }; |
263 | 254 | ||
264 | i2c@7000c400 { | 255 | i2c@7000c400 { |
256 | status = "okay"; | ||
265 | clock-frequency = <400000>; | 257 | clock-frequency = <400000>; |
266 | }; | 258 | }; |
267 | 259 | ||
268 | i2c@7000c500 { | ||
269 | status = "disable"; | ||
270 | }; | ||
271 | |||
272 | nvec { | 260 | nvec { |
273 | compatible = "nvidia,nvec"; | 261 | compatible = "nvidia,nvec"; |
274 | reg = <0x7000c500 0x100>; | 262 | reg = <0x7000c500 0x100>; |
@@ -281,6 +269,7 @@ | |||
281 | }; | 269 | }; |
282 | 270 | ||
283 | i2c@7000d000 { | 271 | i2c@7000d000 { |
272 | status = "okay"; | ||
284 | clock-frequency = <400000>; | 273 | clock-frequency = <400000>; |
285 | 274 | ||
286 | adt7461@4c { | 275 | adt7461@4c { |
@@ -289,25 +278,28 @@ | |||
289 | }; | 278 | }; |
290 | }; | 279 | }; |
291 | 280 | ||
281 | usb@c5000000 { | ||
282 | status = "okay"; | ||
283 | }; | ||
284 | |||
292 | usb@c5004000 { | 285 | usb@c5004000 { |
286 | status = "okay"; | ||
293 | nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */ | 287 | nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */ |
294 | }; | 288 | }; |
295 | 289 | ||
290 | usb@c5008000 { | ||
291 | status = "okay"; | ||
292 | }; | ||
293 | |||
296 | sdhci@c8000000 { | 294 | sdhci@c8000000 { |
295 | status = "okay"; | ||
297 | cd-gpios = <&gpio 173 0>; /* gpio PV5 */ | 296 | cd-gpios = <&gpio 173 0>; /* gpio PV5 */ |
298 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 297 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
299 | power-gpios = <&gpio 169 0>; /* gpio PV1 */ | 298 | power-gpios = <&gpio 169 0>; /* gpio PV1 */ |
300 | }; | 299 | }; |
301 | 300 | ||
302 | sdhci@c8000200 { | ||
303 | status = "disable"; | ||
304 | }; | ||
305 | |||
306 | sdhci@c8000400 { | ||
307 | status = "disable"; | ||
308 | }; | ||
309 | |||
310 | sdhci@c8000600 { | 301 | sdhci@c8000600 { |
302 | status = "okay"; | ||
311 | support-8bit; | 303 | support-8bit; |
312 | }; | 304 | }; |
313 | 305 | ||
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index 88f3b8e0c8c0..21b586e41e97 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts | |||
@@ -257,31 +257,17 @@ | |||
257 | }; | 257 | }; |
258 | }; | 258 | }; |
259 | 259 | ||
260 | i2s@70002a00 { | 260 | i2s@70002800 { |
261 | status = "disable"; | 261 | status = "okay"; |
262 | }; | ||
263 | |||
264 | serial@70006000 { | ||
265 | status = "disable"; | ||
266 | }; | ||
267 | |||
268 | serial@70006040 { | ||
269 | status = "disable"; | ||
270 | }; | ||
271 | |||
272 | serial@70006200 { | ||
273 | status = "disable"; | ||
274 | }; | 262 | }; |
275 | 263 | ||
276 | serial@70006300 { | 264 | serial@70006300 { |
265 | status = "okay"; | ||
277 | clock-frequency = <216000000>; | 266 | clock-frequency = <216000000>; |
278 | }; | 267 | }; |
279 | 268 | ||
280 | serial@70006400 { | ||
281 | status = "disable"; | ||
282 | }; | ||
283 | |||
284 | i2c@7000c000 { | 269 | i2c@7000c000 { |
270 | status = "okay"; | ||
285 | clock-frequency = <400000>; | 271 | clock-frequency = <400000>; |
286 | 272 | ||
287 | wm8903: wm8903@1a { | 273 | wm8903: wm8903@1a { |
@@ -315,6 +301,7 @@ | |||
315 | }; | 301 | }; |
316 | 302 | ||
317 | i2c@7000c400 { | 303 | i2c@7000c400 { |
304 | status = "okay"; | ||
318 | clock-frequency = <100000>; | 305 | clock-frequency = <100000>; |
319 | 306 | ||
320 | smart-battery@b { | 307 | smart-battery@b { |
@@ -326,10 +313,12 @@ | |||
326 | }; | 313 | }; |
327 | 314 | ||
328 | i2c@7000c500 { | 315 | i2c@7000c500 { |
316 | status = "okay"; | ||
329 | clock-frequency = <400000>; | 317 | clock-frequency = <400000>; |
330 | }; | 318 | }; |
331 | 319 | ||
332 | i2c@7000d000 { | 320 | i2c@7000d000 { |
321 | status = "okay"; | ||
333 | clock-frequency = <400000>; | 322 | clock-frequency = <400000>; |
334 | 323 | ||
335 | temperature-sensor@4c { | 324 | temperature-sensor@4c { |
@@ -384,29 +373,29 @@ | |||
384 | }; | 373 | }; |
385 | 374 | ||
386 | usb@c5000000 { | 375 | usb@c5000000 { |
376 | status = "okay"; | ||
387 | nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */ | 377 | nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */ |
388 | dr_mode = "otg"; | 378 | dr_mode = "otg"; |
389 | }; | 379 | }; |
390 | 380 | ||
391 | usb@c5004000 { | 381 | usb@c5004000 { |
382 | status = "okay"; | ||
392 | nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ | 383 | nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ |
393 | }; | 384 | }; |
394 | 385 | ||
395 | sdhci@c8000000 { | 386 | usb@c5008000 { |
396 | status = "disable"; | 387 | status = "okay"; |
397 | }; | ||
398 | |||
399 | sdhci@c8000200 { | ||
400 | status = "disable"; | ||
401 | }; | 388 | }; |
402 | 389 | ||
403 | sdhci@c8000400 { | 390 | sdhci@c8000400 { |
391 | status = "okay"; | ||
404 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 392 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
405 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 393 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
406 | power-gpios = <&gpio 70 0>; /* gpio PI6 */ | 394 | power-gpios = <&gpio 70 0>; /* gpio PI6 */ |
407 | }; | 395 | }; |
408 | 396 | ||
409 | sdhci@c8000600 { | 397 | sdhci@c8000600 { |
398 | status = "okay"; | ||
410 | support-8bit; | 399 | support-8bit; |
411 | }; | 400 | }; |
412 | 401 | ||
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index 1dea6cc68dde..6fc52afa9431 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts | |||
@@ -240,39 +240,27 @@ | |||
240 | }; | 240 | }; |
241 | }; | 241 | }; |
242 | 242 | ||
243 | i2s@70002a00 { | 243 | i2s@70002800 { |
244 | status = "disable"; | 244 | status = "okay"; |
245 | }; | 245 | }; |
246 | 246 | ||
247 | serial@70006000 { | 247 | serial@70006000 { |
248 | status = "okay"; | ||
248 | clock-frequency = <216000000>; | 249 | clock-frequency = <216000000>; |
249 | }; | 250 | }; |
250 | 251 | ||
251 | serial@70006040 { | ||
252 | status = "disable"; | ||
253 | }; | ||
254 | |||
255 | serial@70006200 { | ||
256 | status = "disable"; | ||
257 | }; | ||
258 | |||
259 | serial@70006300 { | ||
260 | status = "disable"; | ||
261 | }; | ||
262 | |||
263 | serial@70006400 { | ||
264 | status = "disable"; | ||
265 | }; | ||
266 | |||
267 | i2c@7000c000 { | 252 | i2c@7000c000 { |
253 | status = "okay"; | ||
268 | clock-frequency = <400000>; | 254 | clock-frequency = <400000>; |
269 | }; | 255 | }; |
270 | 256 | ||
271 | i2c@7000c400 { | 257 | i2c@7000c400 { |
258 | status = "okay"; | ||
272 | clock-frequency = <400000>; | 259 | clock-frequency = <400000>; |
273 | }; | 260 | }; |
274 | 261 | ||
275 | i2c@7000c500 { | 262 | i2c@7000c500 { |
263 | status = "okay"; | ||
276 | clock-frequency = <400000>; | 264 | clock-frequency = <400000>; |
277 | 265 | ||
278 | codec: codec@1a { | 266 | codec: codec@1a { |
@@ -286,23 +274,24 @@ | |||
286 | }; | 274 | }; |
287 | }; | 275 | }; |
288 | 276 | ||
289 | i2c@7000d000 { | 277 | usb@c5000000 { |
290 | status = "disable"; | 278 | status = "okay"; |
291 | }; | 279 | }; |
292 | 280 | ||
293 | usb@c5004000 { | 281 | usb@c5004000 { |
294 | nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */ | 282 | nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */ |
295 | }; | 283 | }; |
296 | 284 | ||
297 | sdhci@c8000200 { | 285 | usb@c5008000 { |
298 | status = "disable"; | 286 | status = "okay"; |
299 | }; | 287 | }; |
300 | 288 | ||
301 | sdhci@c8000400 { | 289 | sdhci@c8000000 { |
302 | status = "disable"; | 290 | status = "okay"; |
303 | }; | 291 | }; |
304 | 292 | ||
305 | sdhci@c8000600 { | 293 | sdhci@c8000600 { |
294 | status = "okay"; | ||
306 | cd-gpios = <&gpio 121 0>; /* gpio PP1 */ | 295 | cd-gpios = <&gpio 121 0>; /* gpio PP1 */ |
307 | wp-gpios = <&gpio 122 0>; /* gpio PP2 */ | 296 | wp-gpios = <&gpio 122 0>; /* gpio PP2 */ |
308 | }; | 297 | }; |
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index 6de4c106024f..15d8fdbe21f2 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts | |||
@@ -240,31 +240,17 @@ | |||
240 | }; | 240 | }; |
241 | }; | 241 | }; |
242 | 242 | ||
243 | i2s@70002a00 { | 243 | i2s@70002800 { |
244 | status = "disable"; | 244 | status = "okay"; |
245 | }; | ||
246 | |||
247 | serial@70006000 { | ||
248 | status = "disable"; | ||
249 | }; | ||
250 | |||
251 | serial@70006040 { | ||
252 | status = "disable"; | ||
253 | }; | ||
254 | |||
255 | serial@70006200 { | ||
256 | status = "disable"; | ||
257 | }; | 245 | }; |
258 | 246 | ||
259 | serial@70006300 { | 247 | serial@70006300 { |
248 | status = "okay"; | ||
260 | clock-frequency = <216000000>; | 249 | clock-frequency = <216000000>; |
261 | }; | 250 | }; |
262 | 251 | ||
263 | serial@70006400 { | ||
264 | status = "disable"; | ||
265 | }; | ||
266 | |||
267 | i2c@7000c000 { | 252 | i2c@7000c000 { |
253 | status = "okay"; | ||
268 | clock-frequency = <400000>; | 254 | clock-frequency = <400000>; |
269 | 255 | ||
270 | wm8903: wm8903@1a { | 256 | wm8903: wm8903@1a { |
@@ -291,36 +277,42 @@ | |||
291 | }; | 277 | }; |
292 | 278 | ||
293 | i2c@7000c400 { | 279 | i2c@7000c400 { |
280 | status = "okay"; | ||
294 | clock-frequency = <400000>; | 281 | clock-frequency = <400000>; |
295 | }; | 282 | }; |
296 | 283 | ||
297 | i2c@7000c500 { | 284 | i2c@7000c500 { |
285 | status = "okay"; | ||
298 | clock-frequency = <400000>; | 286 | clock-frequency = <400000>; |
299 | }; | 287 | }; |
300 | 288 | ||
301 | i2c@7000d000 { | 289 | i2c@7000d000 { |
290 | status = "okay"; | ||
302 | clock-frequency = <400000>; | 291 | clock-frequency = <400000>; |
303 | }; | 292 | }; |
304 | 293 | ||
305 | usb@c5004000 { | 294 | usb@c5000000 { |
306 | nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ | 295 | status = "okay"; |
307 | }; | 296 | }; |
308 | 297 | ||
309 | sdhci@c8000000 { | 298 | usb@c5004000 { |
310 | status = "disable"; | 299 | status = "okay"; |
300 | nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ | ||
311 | }; | 301 | }; |
312 | 302 | ||
313 | sdhci@c8000200 { | 303 | usb@c5008000 { |
314 | status = "disable"; | 304 | status = "okay"; |
315 | }; | 305 | }; |
316 | 306 | ||
317 | sdhci@c8000400 { | 307 | sdhci@c8000400 { |
308 | status = "okay"; | ||
318 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 309 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
319 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 310 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
320 | power-gpios = <&gpio 70 0>; /* gpio PI6 */ | 311 | power-gpios = <&gpio 70 0>; /* gpio PI6 */ |
321 | }; | 312 | }; |
322 | 313 | ||
323 | sdhci@c8000600 { | 314 | sdhci@c8000600 { |
315 | status = "okay"; | ||
324 | support-8bit; | 316 | support-8bit; |
325 | }; | 317 | }; |
326 | 318 | ||
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index df34defe1bbd..c417d67e9027 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
@@ -72,6 +72,7 @@ | |||
72 | reg = <0x70002800 0x200>; | 72 | reg = <0x70002800 0x200>; |
73 | interrupts = <0 13 0x04>; | 73 | interrupts = <0 13 0x04>; |
74 | nvidia,dma-request-selector = <&apbdma 2>; | 74 | nvidia,dma-request-selector = <&apbdma 2>; |
75 | status = "disable"; | ||
75 | }; | 76 | }; |
76 | 77 | ||
77 | tegra_i2s2: i2s@70002a00 { | 78 | tegra_i2s2: i2s@70002a00 { |
@@ -79,6 +80,7 @@ | |||
79 | reg = <0x70002a00 0x200>; | 80 | reg = <0x70002a00 0x200>; |
80 | interrupts = <0 3 0x04>; | 81 | interrupts = <0 3 0x04>; |
81 | nvidia,dma-request-selector = <&apbdma 1>; | 82 | nvidia,dma-request-selector = <&apbdma 1>; |
83 | status = "disable"; | ||
82 | }; | 84 | }; |
83 | 85 | ||
84 | serial@70006000 { | 86 | serial@70006000 { |
@@ -86,6 +88,7 @@ | |||
86 | reg = <0x70006000 0x40>; | 88 | reg = <0x70006000 0x40>; |
87 | reg-shift = <2>; | 89 | reg-shift = <2>; |
88 | interrupts = <0 36 0x04>; | 90 | interrupts = <0 36 0x04>; |
91 | status = "disable"; | ||
89 | }; | 92 | }; |
90 | 93 | ||
91 | serial@70006040 { | 94 | serial@70006040 { |
@@ -93,6 +96,7 @@ | |||
93 | reg = <0x70006040 0x40>; | 96 | reg = <0x70006040 0x40>; |
94 | reg-shift = <2>; | 97 | reg-shift = <2>; |
95 | interrupts = <0 37 0x04>; | 98 | interrupts = <0 37 0x04>; |
99 | status = "disable"; | ||
96 | }; | 100 | }; |
97 | 101 | ||
98 | serial@70006200 { | 102 | serial@70006200 { |
@@ -100,6 +104,7 @@ | |||
100 | reg = <0x70006200 0x100>; | 104 | reg = <0x70006200 0x100>; |
101 | reg-shift = <2>; | 105 | reg-shift = <2>; |
102 | interrupts = <0 46 0x04>; | 106 | interrupts = <0 46 0x04>; |
107 | status = "disable"; | ||
103 | }; | 108 | }; |
104 | 109 | ||
105 | serial@70006300 { | 110 | serial@70006300 { |
@@ -107,6 +112,7 @@ | |||
107 | reg = <0x70006300 0x100>; | 112 | reg = <0x70006300 0x100>; |
108 | reg-shift = <2>; | 113 | reg-shift = <2>; |
109 | interrupts = <0 90 0x04>; | 114 | interrupts = <0 90 0x04>; |
115 | status = "disable"; | ||
110 | }; | 116 | }; |
111 | 117 | ||
112 | serial@70006400 { | 118 | serial@70006400 { |
@@ -114,6 +120,7 @@ | |||
114 | reg = <0x70006400 0x100>; | 120 | reg = <0x70006400 0x100>; |
115 | reg-shift = <2>; | 121 | reg-shift = <2>; |
116 | interrupts = <0 91 0x04>; | 122 | interrupts = <0 91 0x04>; |
123 | status = "disable"; | ||
117 | }; | 124 | }; |
118 | 125 | ||
119 | i2c@7000c000 { | 126 | i2c@7000c000 { |
@@ -122,6 +129,7 @@ | |||
122 | interrupts = <0 38 0x04>; | 129 | interrupts = <0 38 0x04>; |
123 | #address-cells = <1>; | 130 | #address-cells = <1>; |
124 | #size-cells = <0>; | 131 | #size-cells = <0>; |
132 | status = "disable"; | ||
125 | }; | 133 | }; |
126 | 134 | ||
127 | i2c@7000c400 { | 135 | i2c@7000c400 { |
@@ -130,6 +138,7 @@ | |||
130 | interrupts = <0 84 0x04>; | 138 | interrupts = <0 84 0x04>; |
131 | #address-cells = <1>; | 139 | #address-cells = <1>; |
132 | #size-cells = <0>; | 140 | #size-cells = <0>; |
141 | status = "disable"; | ||
133 | }; | 142 | }; |
134 | 143 | ||
135 | i2c@7000c500 { | 144 | i2c@7000c500 { |
@@ -138,6 +147,7 @@ | |||
138 | interrupts = <0 92 0x04>; | 147 | interrupts = <0 92 0x04>; |
139 | #address-cells = <1>; | 148 | #address-cells = <1>; |
140 | #size-cells = <0>; | 149 | #size-cells = <0>; |
150 | status = "disable"; | ||
141 | }; | 151 | }; |
142 | 152 | ||
143 | i2c@7000d000 { | 153 | i2c@7000d000 { |
@@ -146,6 +156,7 @@ | |||
146 | interrupts = <0 53 0x04>; | 156 | interrupts = <0 53 0x04>; |
147 | #address-cells = <1>; | 157 | #address-cells = <1>; |
148 | #size-cells = <0>; | 158 | #size-cells = <0>; |
159 | status = "disable"; | ||
149 | }; | 160 | }; |
150 | 161 | ||
151 | pmc { | 162 | pmc { |
@@ -179,6 +190,7 @@ | |||
179 | interrupts = <0 20 0x04>; | 190 | interrupts = <0 20 0x04>; |
180 | phy_type = "utmi"; | 191 | phy_type = "utmi"; |
181 | nvidia,has-legacy-mode; | 192 | nvidia,has-legacy-mode; |
193 | status = "disable"; | ||
182 | }; | 194 | }; |
183 | 195 | ||
184 | usb@c5004000 { | 196 | usb@c5004000 { |
@@ -186,6 +198,7 @@ | |||
186 | reg = <0xc5004000 0x4000>; | 198 | reg = <0xc5004000 0x4000>; |
187 | interrupts = <0 21 0x04>; | 199 | interrupts = <0 21 0x04>; |
188 | phy_type = "ulpi"; | 200 | phy_type = "ulpi"; |
201 | status = "disable"; | ||
189 | }; | 202 | }; |
190 | 203 | ||
191 | usb@c5008000 { | 204 | usb@c5008000 { |
@@ -193,30 +206,35 @@ | |||
193 | reg = <0xc5008000 0x4000>; | 206 | reg = <0xc5008000 0x4000>; |
194 | interrupts = <0 97 0x04>; | 207 | interrupts = <0 97 0x04>; |
195 | phy_type = "utmi"; | 208 | phy_type = "utmi"; |
209 | status = "disable"; | ||
196 | }; | 210 | }; |
197 | 211 | ||
198 | sdhci@c8000000 { | 212 | sdhci@c8000000 { |
199 | compatible = "nvidia,tegra20-sdhci"; | 213 | compatible = "nvidia,tegra20-sdhci"; |
200 | reg = <0xc8000000 0x200>; | 214 | reg = <0xc8000000 0x200>; |
201 | interrupts = <0 14 0x04>; | 215 | interrupts = <0 14 0x04>; |
216 | status = "disable"; | ||
202 | }; | 217 | }; |
203 | 218 | ||
204 | sdhci@c8000200 { | 219 | sdhci@c8000200 { |
205 | compatible = "nvidia,tegra20-sdhci"; | 220 | compatible = "nvidia,tegra20-sdhci"; |
206 | reg = <0xc8000200 0x200>; | 221 | reg = <0xc8000200 0x200>; |
207 | interrupts = <0 15 0x04>; | 222 | interrupts = <0 15 0x04>; |
223 | status = "disable"; | ||
208 | }; | 224 | }; |
209 | 225 | ||
210 | sdhci@c8000400 { | 226 | sdhci@c8000400 { |
211 | compatible = "nvidia,tegra20-sdhci"; | 227 | compatible = "nvidia,tegra20-sdhci"; |
212 | reg = <0xc8000400 0x200>; | 228 | reg = <0xc8000400 0x200>; |
213 | interrupts = <0 19 0x04>; | 229 | interrupts = <0 19 0x04>; |
230 | status = "disable"; | ||
214 | }; | 231 | }; |
215 | 232 | ||
216 | sdhci@c8000600 { | 233 | sdhci@c8000600 { |
217 | compatible = "nvidia,tegra20-sdhci"; | 234 | compatible = "nvidia,tegra20-sdhci"; |
218 | reg = <0xc8000600 0x200>; | 235 | reg = <0xc8000600 0x200>; |
219 | interrupts = <0 31 0x04>; | 236 | interrupts = <0 31 0x04>; |
237 | status = "disable"; | ||
220 | }; | 238 | }; |
221 | 239 | ||
222 | pmu { | 240 | pmu { |
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 5a1c85fbf0f0..2dcc09e784b5 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
@@ -82,6 +82,7 @@ | |||
82 | reg = <0x70006000 0x40>; | 82 | reg = <0x70006000 0x40>; |
83 | reg-shift = <2>; | 83 | reg-shift = <2>; |
84 | interrupts = <0 36 0x04>; | 84 | interrupts = <0 36 0x04>; |
85 | status = "disable"; | ||
85 | }; | 86 | }; |
86 | 87 | ||
87 | serial@70006040 { | 88 | serial@70006040 { |
@@ -89,6 +90,7 @@ | |||
89 | reg = <0x70006040 0x40>; | 90 | reg = <0x70006040 0x40>; |
90 | reg-shift = <2>; | 91 | reg-shift = <2>; |
91 | interrupts = <0 37 0x04>; | 92 | interrupts = <0 37 0x04>; |
93 | status = "disable"; | ||
92 | }; | 94 | }; |
93 | 95 | ||
94 | serial@70006200 { | 96 | serial@70006200 { |
@@ -96,6 +98,7 @@ | |||
96 | reg = <0x70006200 0x100>; | 98 | reg = <0x70006200 0x100>; |
97 | reg-shift = <2>; | 99 | reg-shift = <2>; |
98 | interrupts = <0 46 0x04>; | 100 | interrupts = <0 46 0x04>; |
101 | status = "disable"; | ||
99 | }; | 102 | }; |
100 | 103 | ||
101 | serial@70006300 { | 104 | serial@70006300 { |
@@ -103,6 +106,7 @@ | |||
103 | reg = <0x70006300 0x100>; | 106 | reg = <0x70006300 0x100>; |
104 | reg-shift = <2>; | 107 | reg-shift = <2>; |
105 | interrupts = <0 90 0x04>; | 108 | interrupts = <0 90 0x04>; |
109 | status = "disable"; | ||
106 | }; | 110 | }; |
107 | 111 | ||
108 | serial@70006400 { | 112 | serial@70006400 { |
@@ -110,6 +114,7 @@ | |||
110 | reg = <0x70006400 0x100>; | 114 | reg = <0x70006400 0x100>; |
111 | reg-shift = <2>; | 115 | reg-shift = <2>; |
112 | interrupts = <0 91 0x04>; | 116 | interrupts = <0 91 0x04>; |
117 | status = "disable"; | ||
113 | }; | 118 | }; |
114 | 119 | ||
115 | i2c@7000c000 { | 120 | i2c@7000c000 { |
@@ -118,6 +123,7 @@ | |||
118 | interrupts = <0 38 0x04>; | 123 | interrupts = <0 38 0x04>; |
119 | #address-cells = <1>; | 124 | #address-cells = <1>; |
120 | #size-cells = <0>; | 125 | #size-cells = <0>; |
126 | status = "disable"; | ||
121 | }; | 127 | }; |
122 | 128 | ||
123 | i2c@7000c400 { | 129 | i2c@7000c400 { |
@@ -126,6 +132,7 @@ | |||
126 | interrupts = <0 84 0x04>; | 132 | interrupts = <0 84 0x04>; |
127 | #address-cells = <1>; | 133 | #address-cells = <1>; |
128 | #size-cells = <0>; | 134 | #size-cells = <0>; |
135 | status = "disable"; | ||
129 | }; | 136 | }; |
130 | 137 | ||
131 | i2c@7000c500 { | 138 | i2c@7000c500 { |
@@ -134,6 +141,7 @@ | |||
134 | interrupts = <0 92 0x04>; | 141 | interrupts = <0 92 0x04>; |
135 | #address-cells = <1>; | 142 | #address-cells = <1>; |
136 | #size-cells = <0>; | 143 | #size-cells = <0>; |
144 | status = "disable"; | ||
137 | }; | 145 | }; |
138 | 146 | ||
139 | i2c@7000c700 { | 147 | i2c@7000c700 { |
@@ -142,6 +150,7 @@ | |||
142 | interrupts = <0 120 0x04>; | 150 | interrupts = <0 120 0x04>; |
143 | #address-cells = <1>; | 151 | #address-cells = <1>; |
144 | #size-cells = <0>; | 152 | #size-cells = <0>; |
153 | status = "disable"; | ||
145 | }; | 154 | }; |
146 | 155 | ||
147 | i2c@7000d000 { | 156 | i2c@7000d000 { |
@@ -150,6 +159,7 @@ | |||
150 | interrupts = <0 53 0x04>; | 159 | interrupts = <0 53 0x04>; |
151 | #address-cells = <1>; | 160 | #address-cells = <1>; |
152 | #size-cells = <0>; | 161 | #size-cells = <0>; |
162 | status = "disable"; | ||
153 | }; | 163 | }; |
154 | 164 | ||
155 | pmc { | 165 | pmc { |
@@ -191,30 +201,35 @@ | |||
191 | compatible = "nvidia,tegra30-i2s"; | 201 | compatible = "nvidia,tegra30-i2s"; |
192 | reg = <0x70080300 0x100>; | 202 | reg = <0x70080300 0x100>; |
193 | nvidia,ahub-cif-ids = <4 4>; | 203 | nvidia,ahub-cif-ids = <4 4>; |
204 | status = "disable"; | ||
194 | }; | 205 | }; |
195 | 206 | ||
196 | tegra_i2s1: i2s@70080400 { | 207 | tegra_i2s1: i2s@70080400 { |
197 | compatible = "nvidia,tegra30-i2s"; | 208 | compatible = "nvidia,tegra30-i2s"; |
198 | reg = <0x70080400 0x100>; | 209 | reg = <0x70080400 0x100>; |
199 | nvidia,ahub-cif-ids = <5 5>; | 210 | nvidia,ahub-cif-ids = <5 5>; |
211 | status = "disable"; | ||
200 | }; | 212 | }; |
201 | 213 | ||
202 | tegra_i2s2: i2s@70080500 { | 214 | tegra_i2s2: i2s@70080500 { |
203 | compatible = "nvidia,tegra30-i2s"; | 215 | compatible = "nvidia,tegra30-i2s"; |
204 | reg = <0x70080500 0x100>; | 216 | reg = <0x70080500 0x100>; |
205 | nvidia,ahub-cif-ids = <6 6>; | 217 | nvidia,ahub-cif-ids = <6 6>; |
218 | status = "disable"; | ||
206 | }; | 219 | }; |
207 | 220 | ||
208 | tegra_i2s3: i2s@70080600 { | 221 | tegra_i2s3: i2s@70080600 { |
209 | compatible = "nvidia,tegra30-i2s"; | 222 | compatible = "nvidia,tegra30-i2s"; |
210 | reg = <0x70080600 0x100>; | 223 | reg = <0x70080600 0x100>; |
211 | nvidia,ahub-cif-ids = <7 7>; | 224 | nvidia,ahub-cif-ids = <7 7>; |
225 | status = "disable"; | ||
212 | }; | 226 | }; |
213 | 227 | ||
214 | tegra_i2s4: i2s@70080700 { | 228 | tegra_i2s4: i2s@70080700 { |
215 | compatible = "nvidia,tegra30-i2s"; | 229 | compatible = "nvidia,tegra30-i2s"; |
216 | reg = <0x70080700 0x100>; | 230 | reg = <0x70080700 0x100>; |
217 | nvidia,ahub-cif-ids = <8 8>; | 231 | nvidia,ahub-cif-ids = <8 8>; |
232 | status = "disable"; | ||
218 | }; | 233 | }; |
219 | }; | 234 | }; |
220 | 235 | ||
@@ -222,24 +237,28 @@ | |||
222 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | 237 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; |
223 | reg = <0x78000000 0x200>; | 238 | reg = <0x78000000 0x200>; |
224 | interrupts = <0 14 0x04>; | 239 | interrupts = <0 14 0x04>; |
240 | status = "disable"; | ||
225 | }; | 241 | }; |
226 | 242 | ||
227 | sdhci@78000200 { | 243 | sdhci@78000200 { |
228 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | 244 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; |
229 | reg = <0x78000200 0x200>; | 245 | reg = <0x78000200 0x200>; |
230 | interrupts = <0 15 0x04>; | 246 | interrupts = <0 15 0x04>; |
247 | status = "disable"; | ||
231 | }; | 248 | }; |
232 | 249 | ||
233 | sdhci@78000400 { | 250 | sdhci@78000400 { |
234 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | 251 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; |
235 | reg = <0x78000400 0x200>; | 252 | reg = <0x78000400 0x200>; |
236 | interrupts = <0 19 0x04>; | 253 | interrupts = <0 19 0x04>; |
254 | status = "disable"; | ||
237 | }; | 255 | }; |
238 | 256 | ||
239 | sdhci@78000600 { | 257 | sdhci@78000600 { |
240 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | 258 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; |
241 | reg = <0x78000600 0x200>; | 259 | reg = <0x78000600 0x200>; |
242 | interrupts = <0 31 0x04>; | 260 | interrupts = <0 31 0x04>; |
261 | status = "disable"; | ||
243 | }; | 262 | }; |
244 | 263 | ||
245 | pmu { | 264 | pmu { |