From: Jason Cooper <jason@lakedaemon.net>
Date: Thu, 2 Jan 2014 15:17:41 +0000 (+0000)
Subject: Merge branch 'mvebu/dt' into for-next
X-Git-Tag: next-20140106~107^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6da7d0ea74e4855d468cb65047ce411759ad593d;p=karo-tx-linux.git

Merge branch 'mvebu/dt' into for-next

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

6da7d0ea74e4855d468cb65047ce411759ad593d
diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 7f10f627ae5b,46a541e626e7..b6b253924893
--- 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>;