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

Merge "mvebu/dt #2" from Andrew Lunn:

Second set of dt patches for mvebu for v3.20.

* tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: make DTS comments reflect DEBUG_LL changes
  ARM: mvebu: Armada 385 GP: Add regulators to the SATA port
  ARM: Kirkwood: Added support for pogoplug e02 (pink/gray)
  ARM: mvebu: fix compatible strings of MBus on Armada 375 and Armada 38x
  dt: bindings: update mvebu-mbus DT binding with new compatible properties

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

6 files changed, 267 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index bb55b6a84a6a..89b732b6d6cf 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -187,6 +187,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
         kirkwood-openrd-base.dtb \
         kirkwood-openrd-client.dtb \
         kirkwood-openrd-ultimate.dtb \
+        kirkwood-pogo_e02.dtb \
         kirkwood-rd88f6192.dtb \
         kirkwood-rd88f6281-z0.dtb \
         kirkwood-rd88f6281-a.dtb \
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 50096d3427eb..126bf7e9e6b4 100644
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -63,7 +63,7 @@
         };
 
         soc {
-                compatible = "marvell,armada375-mbus", "marvell,armada370-mbus", "simple-bus";
+                compatible = "marvell,armada375-mbus", "simple-bus";
                 #address-cells = <2>;
                 #size-cells = <1>;
                 controller = <&mbusc>;
diff --git a/arch/arm/boot/dts/armada-388-gp.dts b/arch/arm/boot/dts/armada-388-gp.dts
index 4df22bf91683..590b383db323 100644
--- a/arch/arm/boot/dts/armada-388-gp.dts
+++ b/arch/arm/boot/dts/armada-388-gp.dts
@@ -173,6 +173,16 @@
                                 status = "okay";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+
+                                sata0: sata-port@0 {
+                                        reg = <0>;
+                                        target-supply = <&reg_5v_sata0>;
+                                };
+
+                                sata1: sata-port@1 {
+                                        reg = <1>;
+                                        target-supply = <&reg_5v_sata1>;
+                                };
                         };
 
                         sata@e0000 {
@@ -181,6 +191,16 @@
                                 status = "okay";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+
+                                sata2: sata-port@0 {
+                                        reg = <0>;
+                                        target-supply = <&reg_5v_sata2>;
+                                };
+
+                                sata3: sata-port@1 {
+                                        reg = <1>;
+                                        target-supply = <&reg_5v_sata3>;
+                                };
                         };
 
                         sdhci@d8000 {
@@ -278,6 +298,112 @@
                 regulator-always-on;
                 gpio = <&expander0 4 GPIO_ACTIVE_HIGH>;
         };
+
+        reg_sata0: pwr-sata0 {
+                compatible = "regulator-fixed";
+                regulator-name = "pwr_en_sata0";
+                enable-active-high;
+                regulator-always-on;
+
+        };
+
+        reg_5v_sata0: v5-sata0 {
+                compatible = "regulator-fixed";
+                regulator-name = "v5.0-sata0";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata0>;
+        };
+
+        reg_12v_sata0: v12-sata0 {
+                compatible = "regulator-fixed";
+                regulator-name = "v12.0-sata0";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata0>;
+        };
+
+        reg_sata1: pwr-sata1 {
+                regulator-name = "pwr_en_sata1";
+                compatible = "regulator-fixed";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                enable-active-high;
+                regulator-always-on;
+                gpio = <&expander0 3 GPIO_ACTIVE_HIGH>;
+        };
+
+        reg_5v_sata1: v5-sata1 {
+                compatible = "regulator-fixed";
+                regulator-name = "v5.0-sata1";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata1>;
+        };
+
+        reg_12v_sata1: v12-sata1 {
+                compatible = "regulator-fixed";
+                regulator-name = "v12.0-sata1";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata1>;
+        };
+
+        reg_sata2: pwr-sata2 {
+                compatible = "regulator-fixed";
+                regulator-name = "pwr_en_sata2";
+                enable-active-high;
+                regulator-always-on;
+                gpio = <&expander0 11 GPIO_ACTIVE_HIGH>;
+        };
+
+        reg_5v_sata2: v5-sata2 {
+                compatible = "regulator-fixed";
+                regulator-name = "v5.0-sata2";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata2>;
+        };
+
+        reg_12v_sata2: v12-sata2 {
+                compatible = "regulator-fixed";
+                regulator-name = "v12.0-sata2";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata2>;
+        };
+
+        reg_sata3: pwr-sata3 {
+                compatible = "regulator-fixed";
+                regulator-name = "pwr_en_sata3";
+                enable-active-high;
+                regulator-always-on;
+                gpio = <&expander0 12 GPIO_ACTIVE_HIGH>;
+        };
+
+        reg_5v_sata3: v5-sata3 {
+                compatible = "regulator-fixed";
+                regulator-name = "v5.0-sata3";
+                regulator-min-microvolt = <5000000>;
+                regulator-max-microvolt = <5000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata3>;
+        };
+
+        reg_12v_sata3: v12-sata3 {
+                compatible = "regulator-fixed";
+                regulator-name = "v12.0-sata3";
+                regulator-min-microvolt = <12000000>;
+                regulator-max-microvolt = <12000000>;
+                regulator-always-on;
+                vin-supply = <&reg_sata3>;
+        };
 };
 
 &pinctrl {
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 04fe80d101f8..33cad7f7a224 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -31,8 +31,7 @@
         };
 
         soc {
-                compatible = "marvell,armada380-mbus", "marvell,armada370-mbus",
-                             "simple-bus";
+                compatible = "marvell,armada380-mbus", "simple-bus";
                 #address-cells = <2>;
                 #size-cells = <1>;
                 controller = <&mbusc>;
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
index ca0200e20751..28174ab019f9 100644
--- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -3,8 +3,8 @@
  *
  * Note: this board is shipped with a new generation boot loader that
  * remaps internal registers at 0xf1000000. Therefore, if earlyprintk
- * is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be
- * used.
+ * is used, the CONFIG_DEBUG_MVEBU_UART0_ALTERNATE option or the
+ * CONFIG_DEBUG_MVEBU_UART1_ALTERNATE option should be used.
  *
  * Copyright (C) 2013 Marvell
  *
@@ -60,10 +60,12 @@
                 };
 
                 internal-regs {
+                        /* UART0 */
                         serial@12000 {
                                 status = "okay";
                         };
 
+                        /* UART1 */
                         serial@12100 {
                                 status = "okay";
                         };
diff --git a/arch/arm/boot/dts/kirkwood-pogo_e02.dts b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
new file mode 100644
index 000000000000..a190080c9c4f
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
@@ -0,0 +1,134 @@
+/*
+ * kirkwood-pogo_e02.dts - Device tree file for Pogoplug E02
+ *
+ * Copyright (C) 2015 Christoph Junghans <ottxor@gentoo.org>
+ *
+ * based on information of dts files from
+ *  Arch Linux ARM by Oleg Rakhmanov <moonman.ca@gmail.com>
+ *  OpenWrt by Felix Kaechele <heffer@fedoraproject.org>
+ *
+ * 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"
+
+/ {
+        model = "Cloud Engines Pogoplug E02";
+        compatible = "cloudengines,pogoe02", "marvell,kirkwood-88f6281",
+                     "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8";
+                stdout-path = &uart0;
+        };
+
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                health {
+                        label = "pogo_e02:green:health";
+                        gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+                        default-state = "keep";
+                };
+                fault {
+                        label = "pogo_e02:orange:fault";
+                        gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-0 = <&pmx_usb_power_enable>;
+                pinctrl-names = "default";
+
+                usb_power: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "USB Power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+                };
+        };
+};
+
+&pinctrl {
+        pinctrl-0 = < &pmx_usb_power_enable &pmx_led_orange
+                      &pmx_led_green >;
+        pinctrl-names = "default";
+
+        pmx_usb_power_enable: pmx-usb-power-enable {
+                marvell,pins = "mpp29";
+                marvell,function = "gpio";
+        };
+
+        pmx_led_green: pmx-led-green {
+                marvell,pins = "mpp48";
+                marvell,function = "gpio";
+        };
+
+        pmx_led_orange: pmx-led-orange {
+                marvell,pins = "mpp49";
+                marvell,function = "gpio";
+        };
+};
+
+&uart0 {
+        status = "okay";
+};
+
+&nand {
+        chip-delay = <40>;
+        status = "okay";
+
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x100000>;
+                read-only;
+        };
+
+        partition@100000 {
+                label = "uImage";
+                reg = <0x0100000 0x400000>;
+        };
+
+        partition@500000 {
+                label = "pogoplug";
+                reg = <0x0500000 0x2000000>;
+        };
+
+        partition@2500000 {
+                label = "root";
+                reg = <0x02500000 0x5b00000>;
+        };
+};
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};