[1/2] ARM: bcm2835: fix DT node sort order

Commit Message

Stephen Warren Feb. 12, 2014, 5:03 a.m. UTC

Re-order all the DT nodes so that they're ordered by their reg address.

Signed-off-by: Stephen Warren <[e-mail]>
---
 arch/arm/boot/dts/bcm2835.dtsi | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

Comments

Stephen Warren Feb. 12, 2014, 5:05 a.m. UTC | #1

On 02/11/2014 10:03 PM, Stephen Warren wrote:
> Re-order all the DT nodes so that they're ordered by their reg address.

I've applied this series to bcm2835's for-3.15/dt branch.

Patch

diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
index 398eac3..5ceba45 100644
--- a/arch/arm/boot/dts/bcm2835.dtsi
+++ b/arch/arm/boot/dts/bcm2835.dtsi
@@ -60,14 +60,6 @@ 
 			reg = <0x7e104000 0x10>;
 		};
 
-		uart@20201000 {
-			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
-			reg = <0x7e201000 0x1000>;
-			interrupts = <2 25>;
-			clock-frequency = <3000000>;
-			arm,primecell-periphid = <0x00241011>;
-		};
-
 		gpio: gpio {
 			compatible = "brcm,bcm2835-gpio";
 			reg = <0x7e200000 0xb4>;
@@ -91,6 +83,14 @@ 
 			#interrupt-cells = <2>;
 		};
 
+		uart@20201000 {
+			compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell";
+			reg = <0x7e201000 0x1000>;
+			interrupts = <2 25>;
+			clock-frequency = <3000000>;
+			arm,primecell-periphid = <0x00241011>;
+		};
+
 		i2s: i2s@7e203000 {
 			compatible = "brcm,bcm2835-i2s";
 			reg = <0x7e203000 0x20>,
@@ -121,6 +121,14 @@ 
 			status = "disabled";
 		};
 
+		sdhci: sdhci {
+			compatible = "brcm,bcm2835-sdhci";
+			reg = <0x7e300000 0x100>;
+			interrupts = <2 30>;
+			clocks = <&clk_mmc>;
+			status = "disabled";
+		};
+
 		i2c1: i2c@20804000 {
 			compatible = "brcm,bcm2835-i2c";
 			reg = <0x7e804000 0x1000>;
@@ -131,14 +139,6 @@ 
 			status = "disabled";
 		};
 
-		sdhci: sdhci {
-			compatible = "brcm,bcm2835-sdhci";
-			reg = <0x7e300000 0x100>;
-			interrupts = <2 30>;
-			clocks = <&clk_mmc>;
-			status = "disabled";
-		};
-
 		usb {
 			compatible = "brcm,bcm2835-usb";
 			reg = <0x7e980000 0x10000>;