From: Kevin Hilman <khilman@linaro.org>
Date: Thu, 19 Dec 2013 23:24:56 +0000 (-0800)
Subject: Merge branch 'mvebu/dt-4' into next/dt
X-Git-Tag: v3.14-rc1~112^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=939ac3cd0635d426845d51a4262fd054a3fa4907;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'mvebu/dt-4' into next/dt

* mvebu/dt-4:
  ARM: mvebu: sort DT nodes by address
  ARM: orion5x: sort DT nodes by address
  ARM: dove: sort DT nodes by address
  ARM: kirkwood: sort dt nodes by address

Signed-off-by: Kevin Hilman <khilman@linaro.org>

Conflicts:
	arch/arm/boot/dts/armada-370-xp.dtsi
---

939ac3cd0635d426845d51a4262fd054a3fa4907
diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 45839e53538e9,46a541e626e7c..b6b253924893f
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -146,6 -176,24 +176,24 @@@
  				clock-output-names = "nand";
  			};
  
+ 			mbusc: mbus-controller@20000 {
+ 				compatible = "marvell,mbus-controller";
+ 				reg = <0x20000 0x100>, <0x20180 0x20>;
+ 			};
+ 
+ 			mpic: interrupt-controller@20000 {
+ 				compatible = "marvell,mpic";
+ 				#interrupt-cells = <1>;
+ 				#size-cells = <1>;
+ 				interrupt-controller;
+ 				msi-controller;
+ 			};
+ 
+ 			coherency-fabric@20200 {
+ 				compatible = "marvell,coherency-fabric";
 -				reg = <0x20200 0xb0>, <0x21810 0x1c>;
++				reg = <0x20200 0xb0>, <0x21010 0x1c>;
+ 			};
+ 
  			timer@20300 {
  				reg = <0x20300 0x30>, <0x21040 0x30>;
  				interrupts = <37>, <38>, <39>, <40>, <5>, <6>;