Merge branch 'mvebu/dt' into for-next

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

diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index 52a1f5efc086b4d7bc5a99360f302f328af54ab3,f7da39453d2f369f3c9a34872208e2bf639cfcae..bb6224c77c968c43f380ab023de94429e58071af
--- 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
@@@ -94,17 -98,17 +99,17 @@@
                                reg = <0x72004 0x4>;
                        };
  
-                       ethernet@70000 {
+                       eth0: ethernet@70000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x70000 0x2500>;
 +                              reg = <0x70000 0x4000>;
                                interrupts = <8>;
                                clocks = <&gateclk 4>;
                                status = "disabled";
                        };
  
-                       ethernet@74000 {
+                       eth1: ethernet@74000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x74000 0x2500>;
 +                              reg = <0x74000 0x4000>;
                                interrupts = <10>;
                                clocks = <&gateclk 3>;
                                status = "disabled";

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

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

diff --cc arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 488ca5eb9a55fa646df8771c56dec7f5b224202f,386f0ce48453361aaceede735d9bf4acf6cfeb6a..c7b1f4d5c1c76f9c2ef710b00190c7080ef1829c
--- 1/arch/arm/boot/dts/armada-xp-mv78460.dtsi
--- 2/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@@ -105,9 -106,9 +106,9 @@@
                                interrupts = <91>;
                        };
  
-                       ethernet@34000 {
+                       eth3: ethernet@34000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x34000 0x2500>;
 +                              reg = <0x34000 0x4000>;
                                interrupts = <14>;
                                clocks = <&gateclk 1>;
                                status = "disabled";

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

diff --cc arch/arm/boot/dts/armada-xp.dtsi
index 1ee8540b0ebaf516d940ca020473e21b2fa964ba,6a82fe827ad84ec2809a5c57bfabbb1867e848ac..416eb94818449c7d2ff78ecae2e453be614e6830
--- 1/arch/arm/boot/dts/armada-xp.dtsi
--- 2/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@@ -86,9 -90,9 +90,9 @@@
                                reg = <0x18200 0x500>;
                        };
  
-                       ethernet@30000 {
+                       eth2: ethernet@30000 {
                                compatible = "marvell,armada-370-neta";
 -                              reg = <0x30000 0x2500>;
 +                              reg = <0x30000 0x4000>;
                                interrupts = <12>;
                                clocks = <&gateclk 2>;
                                status = "disabled";

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

diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi
index 4e29460baf040bfa881fdcef4503423848d657dc,b9325d45be78a732c9f3bef765661b4046c09f9b..47fb41bc34122f96e4b28b356203e38f0bd7d24b
--- 1/arch/arm/boot/dts/kirkwood-ts219.dtsi
--- 2/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@@ -30,14 -34,13 +34,18 @@@
                serial@12100 {
                        clock-frequency = <200000000>;
                        status = "okay";
+                       pinctrl-0 = <&pmx_uart1>;
+                       pinctrl-names = "default";
                };
 +              poweroff@12100 {
 +                      compatible = "qnap,power-off";
 +                      reg = <0x12000 0x100>;
 +                      clocks = <&gate_clk 7>;
 +              };
                spi@10600 {
                        status = "okay";
+                       pinctrl-0 = <&pmx_spi>;
+                       pinctrl-names = "default";
  
                        m25p128@0 {
                                #address-cells = <1>;