Merge branch 'mvebu/dt' into for-next

Conflicts:
	arch/arm/boot/dts/kirkwood-t5325.dts

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/armada-370-db.dts
Simple merge

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
Simple merge

diff --cc arch/arm/boot/dts/armada-375-db.dts
Simple merge

diff --cc arch/arm/boot/dts/armada-38x.dtsi
index ca8813bb99ba627d52e7c9d163005d39481f3e1a,28d7c02be805472d3df8338abb2728847ce47a66..3de364e81b5233b615035765b32a0f930f442a95
--- 1/arch/arm/boot/dts/armada-38x.dtsi
--- 2/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@@ -336,9 -373,24 +373,25 @@@
                                #size-cells = <0>;
                                compatible = "marvell,orion-mdio";
                                reg = <0x72004 0x4>;
 +                              clocks = <&gateclk 4>;
                        };
  
+                       sata@a8000 {
+                               compatible = "marvell,armada-380-ahci";
+                               reg = <0xa8000 0x2000>;
+                               interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&gateclk 15>;
+                               status = "disabled";
+                       };
+ 
+                       sata@e0000 {
+                               compatible = "marvell,armada-380-ahci";
+                               reg = <0xe0000 0x2000>;
+                               interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+                               clocks = <&gateclk 30>;
+                               status = "disabled";
+                       };
+ 
                        coredivclk: clock@e4250 {
                                compatible = "marvell,armada-380-corediv-clock";
                                reg = <0xe4250 0xc>;

diff --cc arch/arm/boot/dts/armada-xp-db.dts
Simple merge

diff --cc arch/arm/boot/dts/armada-xp-gp.dts
Simple merge

diff --cc arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-b3.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-cloudbox.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-dreamplug.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-laplug.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index b939f4f52d16a7c0edb677a86558bacd94fec831,343dbb44b3d2699f7232c58229ac1d131d8b4f23..8f76d28759a30747d96014bfb8582622d049798b
--- 1/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
--- 2/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@@ -28,20 -28,11 +28,21 @@@
  
        chosen {
                bootargs = "console=ttyS0,115200n8 earlyprintk";
+               stdout-path = &uart0;
        };
  
 +      mbus {
 +              pcie-controller {
 +                      status = "okay";
 +
 +                      pcie@1,0 {
 +                              status = "okay";
 +                      };
 +              };
 +        };
 +
        ocp@f1000000 {
-               pinctrl@10000 {
+               pin-controller@10000 {
                        pmx_usb_led: pmx-usb-led {
                                marvell,pins = "mpp12";
                                marvell,function = "gpo";

diff --cc arch/arm/boot/dts/kirkwood-ns2-common.dtsi
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-nsa310.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-nsa310a.dts
Simple merge

diff --cc arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
index e2cc85cc3b87e805a113489d3d95cf912d682224,9cb083b72404338f9fb0adc3f81c4ed293079047..2075a2e828f17b6623c71855da85573807fd33f5
--- 1/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
--- 2/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
@@@ -4,20 -4,10 +4,20 @@@
  / {
        model = "ZyXEL NSA310";
  
 +      mbus {
 +              pcie-controller {
 +                      status = "okay";
 +
 +                      pcie@1,0 {
 +                              status = "okay";
 +                      };
 +              };
 +      };
 +
        ocp@f1000000 {
-               pinctrl: pinctrl@10000 {
+               pinctrl: pin-controller@10000 {
  
-                       pmx_usb_power_off: pmx-usb-power-off {
+                       pmx_usb_power: pmx-usb-power {
                                marvell,pins = "mpp21";
                                marvell,function = "gpio";
                        };

diff --cc arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 0650beafc1de0ac4a7e60fbc759ed7726982c22a,3dcb5c26b78b9dc60e56efb1ff2fddc8fa8dcb2c..fb9dc227255d91a2a4bdb58a7adfac3072a80521
--- 1/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
--- 2/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@@ -36,11 -33,9 +33,9 @@@
  
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
  
                        s35390a: s35390a@30 {
 -                              compatible = "s35390a";
 +                              compatible = "sii,s35390a";
                                reg = <0x30>;
                        };
                };

diff --cc arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index 38520a2875146d565c8016f69cc4f324098ff1ee,4e10e92b7822c374b6b562b0503cb3b8dbcf2d66..d5e3bc518968b4acf5e4b811d2944a84d12b79b8
--- 1/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
--- 2/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@@ -48,11 -45,9 +45,9 @@@
  
                i2c@11100 {
                        status = "okay";
-                       pinctrl-0 = <&pmx_twsi1>;
-                       pinctrl-names = "default";
  
                        s24c02: s24c02@50 {
 -                              compatible = "24c02";
 +                              compatible = "atmel,24c02";
                                reg = <0x50>;
                        };
                };