Merge branch 'mvebu/dt' into for-next

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

diff --cc arch/arm/boot/dts/Makefile
index 8522958165bc361eb1409a5a086a8878c56a23b1,3d4b882a0e29e9ebfa530d12a52d4e44d44c0d7d..984a99777da736b164ff8eb41042ba161255f877
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -102,8 -101,8 +103,9 @@@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.
        msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
+       armada-370-netgear-rn102.dtb \
        armada-370-rd.dtb \
 +      armada-xp-axpwifiap.dtb \
        armada-xp-db.dtb \
        armada-xp-gp.dtb \
        armada-xp-openblocks-ax3-4.dtb

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

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

diff --cc arch/arm/boot/dts/armada-xp-mv78230.dtsi
index 0963bc589b6862205a1316a3d5d0bbbe0af8ff5a,ab40f961384f1ac2a57390e70fa4a3e1891d92b4..3f5e6121c730a21ae2079acff268da2be20518ef
--- 1/arch/arm/boot/dts/armada-xp-mv78230.dtsi
--- 2/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@@ -193,9 -74,113 +193,9 @@@
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <87>, <88>, <89>;
                        };
 -
 -                      /*
 -                       * MV78230 has 2 PCIe units Gen2.0: One unit can be
 -                       * configured as x4 or quad x1 lanes. One unit is
 -                       * x4/x1.
 -                       */
 -                      pcie-controller {
 -                              compatible = "marvell,armada-xp-pcie";
 -                              status = "disabled";
 -                              device_type = "pci";
 -
 -#address-cells = <3>;
 -#size-cells = <2>;
 -
 -                              bus-range = <0x00 0xff>;
 -
 -                              ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
 -                                      0x82000000 0 0x42000 0x42000 0 0x00002000   /* Port 2.0 registers */
 -                                      0x82000000 0 0x44000 0x44000 0 0x00002000   /* Port 0.1 registers */
 -                                      0x82000000 0 0x48000 0x48000 0 0x00002000   /* Port 0.2 registers */
 -                                      0x82000000 0 0x4c000 0x4c000 0 0x00002000   /* Port 0.3 registers */
 -                                      0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
 -                                      0x81000000 0 0    0xe8000000 0 0x00100000>; /* downstream I/O */
 -
 -                              pcie@1,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
 -                                      reg = <0x0800 0 0 0 0>;
 -                                      #address-cells = <3>;
 -                                      #size-cells = <2>;
 -                                      #interrupt-cells = <1>;
 -                                      ranges;
 -                                      interrupt-map-mask = <0 0 0 0>;
 -                                      interrupt-map = <0 0 0 0 &mpic 58>;
 -                                      marvell,pcie-port = <0>;
 -                                      marvell,pcie-lane = <0>;
 -                                      clocks = <&gateclk 5>;
 -                                      status = "disabled";
 -                              };
 -
 -                              pcie@2,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
 -                                      reg = <0x1000 0 0 0 0>;
 -                                      #address-cells = <3>;
 -                                      #size-cells = <2>;
 -                                      #interrupt-cells = <1>;
 -                                      ranges;
 -                                      interrupt-map-mask = <0 0 0 0>;
 -                                      interrupt-map = <0 0 0 0 &mpic 59>;
 -                                      marvell,pcie-port = <0>;
 -                                      marvell,pcie-lane = <1>;
 -                                      clocks = <&gateclk 6>;
 -                                      status = "disabled";
 -                              };
 -
 -                              pcie@3,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
 -                                      reg = <0x1800 0 0 0 0>;
 -                                      #address-cells = <3>;
 -                                      #size-cells = <2>;
 -                                      #interrupt-cells = <1>;
 -                                      ranges;
 -                                      interrupt-map-mask = <0 0 0 0>;
 -                                      interrupt-map = <0 0 0 0 &mpic 60>;
 -                                      marvell,pcie-port = <0>;
 -                                      marvell,pcie-lane = <2>;
 -                                      clocks = <&gateclk 7>;
 -                                      status = "disabled";
 -                              };
 -
 -                              pcie@4,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
 -                                      reg = <0x2000 0 0 0 0>;
 -                                      #address-cells = <3>;
 -                                      #size-cells = <2>;
 -                                      #interrupt-cells = <1>;
 -                                      ranges;
 -                                      interrupt-map-mask = <0 0 0 0>;
 -                                      interrupt-map = <0 0 0 0 &mpic 61>;
 -                                      marvell,pcie-port = <0>;
 -                                      marvell,pcie-lane = <3>;
 -                                      clocks = <&gateclk 8>;
 -                                      status = "disabled";
 -                              };
 -
 -                              pcie@9,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
 -                                      reg = <0x4800 0 0 0 0>;
 -                                      #address-cells = <3>;
 -                                      #size-cells = <2>;
 -                                      #interrupt-cells = <1>;
 -                                      ranges;
 -                                      interrupt-map-mask = <0 0 0 0>;
 -                                      interrupt-map = <0 0 0 0 &mpic 99>;
 -                                      marvell,pcie-port = <2>;
 -                                      marvell,pcie-lane = <0>;
 -                                      clocks = <&gateclk 26>;
 -                                      status = "disabled";
 -                              };
 -                      };
                };
        };
  };

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

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

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

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

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