Merge branch 'mvebu/dt' into for-next

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

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 7f10f627ae5b72b7f560732c6e8d5bb35b943e69,46a541e626e7c2503130947083fa4912b4c227e5..b6b253924893fffb88b21e7271653d5eb690d56e
--- 1/arch/arm/boot/dts/armada-370-xp.dtsi
--- 2/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";
                        };
  
 -                              reg = <0x20200 0xb0>, <0x21810 0x1c>;
+                       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>, <0x21010 0x1c>;
+                       };
+ 
                        timer@20300 {
                                reg = <0x20300 0x30>, <0x21040 0x30>;
                                interrupts = <37>, <38>, <39>, <40>, <5>, <6>;