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

Merge "ARM: mvebu: DT changes for v3.17" from Jason Cooper:

mvebu DT changes for v3.17
 - kirkwood
   * add boards net2big and net5big

 - dove
   * add vendor prefix for SolidRun
   * split CuBox into it's variants

* tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: fix net5big regulator gpio assignments
  ARM: dts: mvebu: split SolidRun CuBox into variants
  dt-binding: add vendor prefix for SolidRun
  ARM: Kirkwood: Add DT descriptions for net2big and net5big.

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

7 files changed, 309 insertions, 3 deletions

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 46a311e728a8..4c4883e05df7 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -122,6 +122,7 @@ sii	Seiko Instruments, Inc.
 sirf    SiRF Technology, Inc.
 smsc    Standard Microsystems Corporation
 snps    Synopsys, Inc.
+solidrun        SolidRun
 spansion        Spansion Inc.
 st      STMicroelectronics
 ste     ST-Ericsson
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 81bd72af529e..41c73a1f08df 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -125,6 +125,8 @@ kirkwood := \
         kirkwood-lsxhl.dtb \
         kirkwood-mplcec4.dtb \
         kirkwood-mv88f6281gtw-ge.dtb \
+        kirkwood-net2big.dtb \
+        kirkwood-net5big.dtb \
         kirkwood-netgear_readynas_duo_v2.dtb \
         kirkwood-netgear_readynas_nv+_v2.dtb \
         kirkwood-ns2.dtb \
@@ -471,6 +473,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
         armada-xp-openblocks-ax3-4.dtb
 dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
         dove-cubox.dtb \
+        dove-cubox-es.dtb \
         dove-d2plug.dtb \
         dove-d3plug.dtb \
         dove-dove-db.dtb
diff --git a/arch/arm/boot/dts/dove-cubox-es.dts b/arch/arm/boot/dts/dove-cubox-es.dts
new file mode 100644
index 000000000000..e28ef056dd17
--- /dev/null
+++ b/arch/arm/boot/dts/dove-cubox-es.dts
@@ -0,0 +1,12 @@
+#include "dove-cubox.dts"
+
+/ {
+        model = "SolidRun CuBox (Engineering Sample)";
+        compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove";
+};
+
+&sdio0 {
+        /* sdio0 card detect is connected to wrong pin on CuBox ES */
+        cd-gpios = <&gpio0 12 1>;
+        pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
+};
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 7a70f4ca502a..aae7efc09b0b 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -111,9 +111,6 @@
 
 &sdio0 {
         status = "okay";
-        /* sdio0 card detect is connected to wrong pin on CuBox */
-        cd-gpios = <&gpio0 12 1>;
-        pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
 };
 
 &spi0 {
diff --git a/arch/arm/boot/dts/kirkwood-net2big.dts b/arch/arm/boot/dts/kirkwood-net2big.dts
new file mode 100644
index 000000000000..a98deccee59f
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-net2big.dts
@@ -0,0 +1,30 @@
+/*
+ * Device Tree file for LaCie 2Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+*/
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+        model = "LaCie 2Big Network v2";
+        compatible = "lacie,net2big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
new file mode 100644
index 000000000000..d2887ed493f2
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-net5big.dts
@@ -0,0 +1,83 @@
+/*
+ * Device Tree file for LaCie 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+*/
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+        model = "LaCie 5Big Network v2";
+        compatible = "lacie,net5big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;
+        };
+
+};
+
+&regulators {
+        regulator@3 {
+                compatible = "regulator-fixed";
+                reg = <3>;
+                regulator-name = "hdd2power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+        };
+
+        regulator@4 {
+                compatible = "regulator-fixed";
+                reg = <4>;
+                regulator-name = "hdd3power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+        };
+
+        regulator@5 {
+                compatible = "regulator-fixed";
+                reg = <5>;
+                regulator-name = "hdd4power";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                enable-active-high;
+                regulator-always-on;
+                regulator-boot-on;
+                gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+        };
+};
+
+&mdio {
+        ethphy1: ethernet-phy@1 {
+                reg = <0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
+
diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
new file mode 100644
index 000000000000..fd75720547e3
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -0,0 +1,180 @@
+/*
+ * Device Tree common file for LaCie 2Big and 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+*/
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+        chosen {
+                bootargs = "console=ttyS0,115200n8";
+                stdout-path = &uart0;
+        };
+
+        ocp@f1000000 {
+                serial@12000 {
+                        status = "okay";
+                };
+
+                spi@10600 {
+                        status = "okay";
+
+                        flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "mxicy,mx25l4005a";
+                                reg = <0>;
+                                spi-max-frequency = <20000000>;
+                                mode = <0>;
+
+                                partition@0 {
+                                        reg = <0x0 0x80000>;
+                                        label = "u-boot";
+                                };
+                        };
+                };
+
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                /*
+                 * button@1 and button@2 represent a three position rocker
+                 * switch. Thus the conventional KEY_POWER does not fit
+                 */
+                button@1 {
+                        label = "Back power switch (on|auto)";
+                        linux,code = <KEY_ESC>;
+                        linux,input-type = <5>;
+                        gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+                };
+                button@2 {
+                        label = "Back power switch (auto|off)";
+                        linux,code = <KEY_1>;
+                        linux,input-type = <5>;
+                        gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+                };
+                button@3 {
+                        label = "Function button";
+                        linux,code = <KEY_OPTION>;
+                        gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+                };
+
+        };
+
+        gpio-poweroff {
+                compatible = "gpio-poweroff";
+                gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+        };
+
+        regulators: regulators {
+                status = "okay";
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-names = "default";
+
+                regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "hdd0power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+                };
+
+                regulator@2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        regulator-name = "hdd1power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+                };
+
+                clocks {
+                       g762_clk: g762-oscillator {
+                                 compatible = "fixed-clock";
+                                 #clock-cells = <0>;
+                                 clock-frequency = <32768>;
+                       };
+                };
+        };
+};
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                reg = <8>;
+        };
+
+        ethphy1: ethernet-phy@1 {
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
+
+&pinctrl {
+        pinctrl-names = "default";
+
+        pmx_button_function: pmx-button-function {
+                marvell,pins = "mpp34";
+                marvell,function = "gpio";
+        };
+        pmx_button_power_off: pmx-button-power-off {
+                marvell,pins = "mpp15";
+                marvell,function = "gpio";
+        };
+        pmx_button_power_on: pmx-button-power-on {
+                marvell,pins = "mpp13";
+                marvell,function = "gpio";
+        };
+};
+
+&i2c0 {
+        status = "okay";
+
+        eeprom@50 {
+                compatible = "atmel,24c04";
+                pagesize = <16>;
+                reg = <0x50>;
+        };
+
+        g762@3e {
+                compatible = "gmt,g762";
+                reg = <0x3e>;
+                clocks = <&g762_clk>;
+        };
+};