summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra-trimslice.dts
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-05-11 17:03:26 -0600
committerStephen Warren <swarren@nvidia.com>2012-05-14 10:55:15 -0600
commitc04abb3a07b56db4756b6f970609e65a8624b0a3 (patch)
tree8d3290dcd70672b60c1a269e4dd17279eace801c /arch/arm/boot/dts/tegra-trimslice.dts
parent2f32b1faa8c75e2e987c5b714ae25491d8477da5 (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.dts60
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 eebcf504d12..1dea6cc68dd 100644
--- a/arch/arm/boot/dts/tegra-trimslice.dts
+++ b/arch/arm/boot/dts/tegra-trimslice.dts
@@ -240,6 +240,30 @@
};
};
+ i2s@70002a00 {
+ status = "disable";
+ };
+
+ serial@70006000 {
+ clock-frequency = <216000000>;
+ };
+
+ serial@70006040 {
+ status = "disable";
+ };
+
+ serial@70006200 {
+ status = "disable";
+ };
+
+ serial@70006300 {
+ status = "disable";
+ };
+
+ serial@70006400 {
+ status = "disable";
+ };
+
i2c@7000c000 {
clock-frequency = <400000>;
};
@@ -266,34 +290,8 @@
status = "disable";
};
- i2s@70002a00 {
- status = "disable";
- };
-
- sound {
- compatible = "nvidia,tegra-audio-trimslice";
- nvidia,i2s-controller = <&tegra_i2s1>;
- nvidia,audio-codec = <&codec>;
- };
-
- serial@70006000 {
- clock-frequency = <216000000>;
- };
-
- serial@70006040 {
- status = "disable";
- };
-
- serial@70006200 {
- status = "disable";
- };
-
- serial@70006300 {
- status = "disable";
- };
-
- serial@70006400 {
- status = "disable";
+ usb@c5004000 {
+ nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
};
sdhci@c8000200 {
@@ -309,7 +307,9 @@
wp-gpios = <&gpio 122 0>; /* gpio PP2 */
};
- usb@c5004000 {
- nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
+ sound {
+ compatible = "nvidia,tegra-audio-trimslice";
+ nvidia,i2s-controller = <&tegra_i2s1>;
+ nvidia,audio-codec = <&codec>;
};
};