diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-05-11 19:03:26 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-05-14 12:55:15 -0400 |
commit | c04abb3a07b56db4756b6f970609e65a8624b0a3 (patch) | |
tree | 8d3290dcd70672b60c1a269e4dd17279eace801c /arch/arm/boot/dts/tegra-trimslice.dts | |
parent | 2f32b1faa8c75e2e987c5b714ae25491d8477da5 (diff) |
ARM: dt: tegra: sort nodes based on bus order
Sort the nodes according to the following rules:
* First, any overrides for properties or nodes created by included files,
in the order they appeared in the include file.
* Second, any nodes with a reg property, in numerical order.
* Third, any nodes without a reg property, in alphabetical order of node
name.
The second sorting rule at least will probably help if/when we need to
explicitly insert nodes for the various busses in Tegra; that will just
be an indentation change rather than also a node re-ordering.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/tegra-trimslice.dts')
-rw-r--r-- | arch/arm/boot/dts/tegra-trimslice.dts | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index eebcf504d12d..1dea6cc68dde 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts | |||
@@ -240,6 +240,30 @@ | |||
240 | }; | 240 | }; |
241 | }; | 241 | }; |
242 | 242 | ||
243 | i2s@70002a00 { | ||
244 | status = "disable"; | ||
245 | }; | ||
246 | |||
247 | serial@70006000 { | ||
248 | clock-frequency = <216000000>; | ||
249 | }; | ||
250 | |||
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 | |||
243 | i2c@7000c000 { | 267 | i2c@7000c000 { |
244 | clock-frequency = <400000>; | 268 | clock-frequency = <400000>; |
245 | }; | 269 | }; |
@@ -266,34 +290,8 @@ | |||
266 | status = "disable"; | 290 | status = "disable"; |
267 | }; | 291 | }; |
268 | 292 | ||
269 | i2s@70002a00 { | 293 | usb@c5004000 { |
270 | status = "disable"; | 294 | nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */ |
271 | }; | ||
272 | |||
273 | sound { | ||
274 | compatible = "nvidia,tegra-audio-trimslice"; | ||
275 | nvidia,i2s-controller = <&tegra_i2s1>; | ||
276 | nvidia,audio-codec = <&codec>; | ||
277 | }; | ||
278 | |||
279 | serial@70006000 { | ||
280 | clock-frequency = <216000000>; | ||
281 | }; | ||
282 | |||
283 | serial@70006040 { | ||
284 | status = "disable"; | ||
285 | }; | ||
286 | |||
287 | serial@70006200 { | ||
288 | status = "disable"; | ||
289 | }; | ||
290 | |||
291 | serial@70006300 { | ||
292 | status = "disable"; | ||
293 | }; | ||
294 | |||
295 | serial@70006400 { | ||
296 | status = "disable"; | ||
297 | }; | 295 | }; |
298 | 296 | ||
299 | sdhci@c8000200 { | 297 | sdhci@c8000200 { |
@@ -309,7 +307,9 @@ | |||
309 | wp-gpios = <&gpio 122 0>; /* gpio PP2 */ | 307 | wp-gpios = <&gpio 122 0>; /* gpio PP2 */ |
310 | }; | 308 | }; |
311 | 309 | ||
312 | usb@c5004000 { | 310 | sound { |
313 | nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */ | 311 | compatible = "nvidia,tegra-audio-trimslice"; |
312 | nvidia,i2s-controller = <&tegra_i2s1>; | ||
313 | nvidia,audio-codec = <&codec>; | ||
314 | }; | 314 | }; |
315 | }; | 315 | }; |