Merge tag 'mvebu-dt-3.17-2' of git://git.infradead.org/linux-mvebu into next/dt

Merge "ARM: mvebu: DT changes for v3.17 (round 2)" from Jason Cooper:

mvebu DT changes for v3.17 (round 2):

 - kirkwood
  * Add d2 Network v2 board

 - mvebu
  * Add Armada 375 ethernet node
  * Add CA9 MPcore SoC controller node
  * Add support for dynamic freq scaling on Armada XP

* tag 'mvebu-dt-3.17-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: update Armada XP DT for dynamic frequency scaling
  ARM: mvebu: add CA9 MPcore SoC Controller node
  ARM: mvebu: Enable the network controller in Armada 375 DB board
  ARM: mvebu: Add support for the network controller in Armada 375 SoC
  ARM: Kirkwood: add DT support for d2 Network v2
  ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/boot/dts/Makefile
index 41c73a1f08df1bff9c4e8c3306edbf849320639a,abf47db584acc0a32372d12c22ffa8082f6c3172..55405b29761ac8ce49e0bc6a13f2ee0d64fa8dfa
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -66,9 -66,7 +66,9 @@@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
        exynos4210-universal_c210.dtb \
 +      exynos4412-odroidu3.dtb \
        exynos4412-odroidx.dtb \
 +      exynos4412-odroidx2.dtb \
        exynos4412-origen.dtb \
        exynos4412-smdk4412.dtb \
        exynos4412-tiny4412.dtb \
@@@ -95,6 -93,7 +95,7 @@@ dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm
  kirkwood := \
        kirkwood-b3.dtb \
        kirkwood-cloudbox.dtb \
+       kirkwood-d2net.dtb \
        kirkwood-db-88f6281.dtb \
        kirkwood-db-88f6282.dtb \
        kirkwood-dns320.dtb \
@@@ -161,14 -160,10 +162,14 @@@ dtb-$(CONFIG_ARCH_MARCO) += marco-evb.d
  dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
  dtb-$(CONFIG_ARCH_MXC) += \
        imx25-eukrea-mbimxsd25-baseboard.dtb \
 +      imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dtb \
 +      imx25-eukrea-mbimxsd25-baseboard-dvi-svga.dtb \
 +      imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \
        imx25-karo-tx25.dtb \
        imx25-pdk.dtb \
        imx27-apf27.dtb \
        imx27-apf27dev.dtb \
 +      imx27-eukrea-mbimxsd27-baseboard.dtb \
        imx27-pdk.dtb \
        imx27-phytec-phycore-rdk.dtb \
        imx27-phytec-phycard-s-rdk.dtb \
@@@ -190,8 -185,6 +191,8 @@@
        imx53-tx53-x03x.dtb \
        imx53-tx53-x13x.dtb \
        imx53-voipac-bsb.dtb \
 +      imx6dl-aristainetos_4.dtb \
 +      imx6dl-aristainetos_7.dtb \
        imx6dl-cubox-i.dtb \
        imx6dl-dfi-fs700-m60.dtb \
        imx6dl-gw51xx.dtb \
@@@ -201,16 -194,11 +202,16 @@@
        imx6dl-hummingboard.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-phytec-pbab01.dtb \
 +      imx6dl-rex-basic.dtb \
        imx6dl-riotboard.dtb \
        imx6dl-sabreauto.dtb \
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
 +      imx6dl-tx6dl-comtft.dtb \
 +      imx6dl-tx6u-801x.dtb \
 +      imx6dl-tx6u-811x.dtb \
        imx6dl-wandboard.dtb \
 +      imx6dl-wandboard-revb1.dtb \
        imx6q-arm2.dtb \
        imx6q-cm-fx6.dtb \
        imx6q-cubox-i.dtb \
@@@ -224,21 -212,13 +225,21 @@@
        imx6q-gw54xx.dtb \
        imx6q-nitrogen6x.dtb \
        imx6q-phytec-pbab01.dtb \
 +      imx6q-rex-pro.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sbc6x.dtb \
        imx6q-udoo.dtb \
        imx6q-wandboard.dtb \
 +      imx6q-wandboard-revb1.dtb \
 +      imx6q-tx6q-1010.dtb \
 +      imx6q-tx6q-1010-comtft.dtb \
 +      imx6q-tx6q-1020.dtb \
 +      imx6q-tx6q-1020-comtft.dtb \
 +      imx6q-tx6q-1110.dtb \
        imx6sl-evk.dtb \
 +      imx6sx-sdb.dtb \
        vf610-colibri.dtb \
        vf610-cosmic.dtb \
        vf610-twr.dtb
@@@ -314,8 -294,7 +315,8 @@@ dtb-$(CONFIG_SOC_AM33XX) += am335x-base
        am335x-boneblack.dtb \
        am335x-evm.dtb \
        am335x-evmsk.dtb \
 -      am335x-nano.dtb
 +      am335x-nano.dtb \
 +      am335x-pepper.dtb
  dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
        omap4-panda.dtb \
        omap4-panda-a4.dtb \
@@@ -325,7 -304,6 +326,7 @@@
        omap4-var-dvk-om44.dtb \
        omap4-var-stk-om44.dtb
  dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
 +      am437x-sk-evm.dtb \
        am437x-gp-evm.dtb
  dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
        omap5-sbc-t54.dtb \
@@@ -382,10 -360,9 +383,10 @@@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.
        stih415-b2020.dtb \
        stih416-b2000.dtb \
        stih416-b2020.dtb \
 -      stih416-b2020-revE.dtb
 +      stih416-b2020e.dtb
  dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
 +      sun4i-a10-ba10-tvbox.dtb \
        sun4i-a10-cubieboard.dtb \
        sun4i-a10-mini-xplus.dtb \
        sun4i-a10-hackberry.dtb \
@@@ -400,16 -377,12 +401,16 @@@ dtb-$(CONFIG_MACH_SUN5I) += 
  dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-app4-evb1.dtb \
        sun6i-a31-colombus.dtb \
 +      sun6i-a31-hummingbird.dtb \
        sun6i-a31-m9.dtb
  dtb-$(CONFIG_MACH_SUN7I) += \
        sun7i-a20-cubieboard2.dtb \
        sun7i-a20-cubietruck.dtb \
        sun7i-a20-i12-tvbox.dtb \
 -      sun7i-a20-olinuxino-micro.dtb
 +      sun7i-a20-olinuxino-micro.dtb \
 +      sun7i-a20-pcduino3.dtb
 +dtb-$(CONFIG_MACH_SUN8I) += \
 +      sun8i-a23-ippo-q8h-v5.dtb
  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra20-iris-512.dtb \
        tegra20-medcom-wide.dtb \
@@@ -420,7 -393,6 +421,7 @@@
        tegra20-trimslice.dtb \
        tegra20-ventana.dtb \
        tegra20-whistler.dtb \
 +      tegra30-apalis-eval.dtb \
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \

diff --combined arch/arm/boot/dts/armada-375-db.dts
index 1e2919d43d78b2ce81405a46eb7e6e0a8c22280d,cfab2170d518a3e3b75b6c271a6452d5e4d8d01f..929ae00b406361b28a9d32b139d96a5e36ceb435
--- 1/arch/arm/boot/dts/armada-375-db.dts
--- 2/arch/arm/boot/dts/armada-375-db.dts
+++ b/arch/arm/boot/dts/armada-375-db.dts
@@@ -91,8 -91,6 +91,8 @@@
                                marvell,nand-keep-config;
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;
 +                              nand-ecc-strength = <4>;
 +                              nand-ecc-step-size = <512>;
  
                                partition@0 {
                                        label = "U-Boot";
@@@ -123,6 -121,32 +123,32 @@@
                                cd-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
                                wp-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
                        };
+ 
+                       mdio {
+                               phy0: ethernet-phy@0 {
+                                       reg = <0>;
+                               };
+ 
+                               phy3: ethernet-phy@3 {
+                                       reg = <3>;
+                               };
+                       };
+ 
+                       ethernet@f0000 {
+                               status = "okay";
+ 
+                               eth0@c4000 {
+                                       status = "okay";
+                                       phy = <&phy0>;
+                                       phy-mode = "rgmii-id";
+                               };
+ 
+                               eth1@c5000 {
+                                       status = "okay";
+                                       phy = <&phy3>;
+                                       phy-mode = "gmii";
+                               };
+                       };
                };
  
                pcie-controller {

diff --combined arch/arm/boot/dts/armada-38x.dtsi
index 689fa1a467289578ccb0344b7c7550be1e48d709,b479eaa23fcc32ec18ae55bd6b1ca244b6a41dd8..242d0ecc99f33e178fdef408820b8623880fb3bf
--- 1/arch/arm/boot/dts/armada-38x.dtsi
--- 2/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@@ -20,7 -20,7 +20,7 @@@
  
  / {
        model = "Marvell Armada 38x family SoC";
 -      compatible = "marvell,armada38x";
 +      compatible = "marvell,armada380";
  
        aliases {
                gpio0 = &gpio0;
@@@ -286,6 -286,11 +286,11 @@@
                                reg = <0x20800 0x10>;
                        };
  
+                       mpcore-soc-ctrl@20d20 {
+                               compatible = "marvell,armada-380-mpcore-soc-ctrl";
+                               reg = <0x20d20 0x6c>;
+                       };
+ 
                        coherency-fabric@21010 {
                                compatible = "marvell,armada-380-coherency-fabric";
                                reg = <0x21010 0x1c>;