aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2014-02-11 23:44:35 -0500
committerStephen Warren <swarren@wwwdotorg.org>2014-02-11 23:49:54 -0500
commitef3c690cde1e9e42baa20bb5ce9196c371593f60 (patch)
tree9dd77dcb79615af4721e65163a2350d6f7a62e38
parent9511cc4df0072df9e6d55c212711d4c103ac917d (diff)
ARM: bcm2835: fix DT node sort order
Re-order all the DT nodes so that they're ordered by their reg address. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
-rw-r--r--arch/arm/boot/dts/bcm2835.dtsi32
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 398eac377e3c..5ceba45b884a 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -60,14 +60,6 @@
60 reg = <0x7e104000 0x10>; 60 reg = <0x7e104000 0x10>;
61 }; 61 };
62 62
63 uart@20201000 {
64 compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
65 reg = <0x7e201000 0x1000>;
66 interrupts = <2 25>;
67 clock-frequency = <3000000>;
68 arm,primecell-periphid = <0x00241011>;
69 };
70
71 gpio: gpio { 63 gpio: gpio {
72 compatible = "brcm,bcm2835-gpio"; 64 compatible = "brcm,bcm2835-gpio";
73 reg = <0x7e200000 0xb4>; 65 reg = <0x7e200000 0xb4>;
@@ -91,6 +83,14 @@
91 #interrupt-cells = <2>; 83 #interrupt-cells = <2>;
92 }; 84 };
93 85
86 uart@20201000 {
87 compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
88 reg = <0x7e201000 0x1000>;
89 interrupts = <2 25>;
90 clock-frequency = <3000000>;
91 arm,primecell-periphid = <0x00241011>;
92 };
93
94 i2s: i2s@7e203000 { 94 i2s: i2s@7e203000 {
95 compatible = "brcm,bcm2835-i2s"; 95 compatible = "brcm,bcm2835-i2s";
96 reg = <0x7e203000 0x20>, 96 reg = <0x7e203000 0x20>,
@@ -121,6 +121,14 @@
121 status = "disabled"; 121 status = "disabled";
122 }; 122 };
123 123
124 sdhci: sdhci {
125 compatible = "brcm,bcm2835-sdhci";
126 reg = <0x7e300000 0x100>;
127 interrupts = <2 30>;
128 clocks = <&clk_mmc>;
129 status = "disabled";
130 };
131
124 i2c1: i2c@20804000 { 132 i2c1: i2c@20804000 {
125 compatible = "brcm,bcm2835-i2c"; 133 compatible = "brcm,bcm2835-i2c";
126 reg = <0x7e804000 0x1000>; 134 reg = <0x7e804000 0x1000>;
@@ -131,14 +139,6 @@
131 status = "disabled"; 139 status = "disabled";
132 }; 140 };
133 141
134 sdhci: sdhci {
135 compatible = "brcm,bcm2835-sdhci";
136 reg = <0x7e300000 0x100>;
137 interrupts = <2 30>;
138 clocks = <&clk_mmc>;
139 status = "disabled";
140 };
141
142 usb { 142 usb {
143 compatible = "brcm,bcm2835-usb"; 143 compatible = "brcm,bcm2835-usb";
144 reg = <0x7e980000 0x10000>; 144 reg = <0x7e980000 0x10000>;