11 files changed, 432 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 222fe15a8d53..94b3bb4a08ea 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -113,6 +113,9 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \
         kirkwood-nsa310a.dtb \
         kirkwood-openblocks_a6.dtb \
         kirkwood-openblocks_a7.dtb \
+        kirkwood-rd88f6192.dtb \
+        kirkwood-rd88f6281-a0.dtb \
+        kirkwood-rd88f6281-a1.dtb \
         kirkwood-sheevaplug.dtb \
         kirkwood-sheevaplug-esata.dtb \
         kirkwood-topkick.dtb \
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index 08a56bcfc724..82f238a9063f 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -64,6 +64,22 @@
                                 phy-mode = "rgmii-id";
                         };
 
+                        i2c@11000 {
+                                pinctrl-0 = <&i2c0_pins>;
+                                pinctrl-names = "default";
+                                status = "okay";
+                                audio_codec: audio-codec@4a {
+                                        compatible = "cirrus,cs42l51";
+                                        reg = <0x4a>;
+                                };
+                        };
+
+                        audio-controller@30000 {
+                                pinctrl-0 = <&i2s_pins2>;
+                                pinctrl-names = "default";
+                                status = "okay";
+                        };
+
                         mvsdio@d4000 {
                                 pinctrl-0 = <&sdio_pins1>;
                                 pinctrl-names = "default";
@@ -80,6 +96,30 @@
                                 broken-cd;
                         };
 
+                        pinctrl {
+                                /*
+                                 * These pins might be muxed as I2S by
+                                 * the bootloader, but it conflicts
+                                 * with the real I2S pins that are
+                                 * muxed using i2s_pins. We must mux
+                                 * those pins to a function other than
+                                 * I2S.
+                                 */
+                                pinctrl-0 = <&hog_pins1 &hog_pins2>;
+                                pinctrl-names = "default";
+
+                                hog_pins1: hog-pins1 {
+                                        marvell,pins = "mpp6",  "mpp8", "mpp10",
+                                                       "mpp12", "mpp13";
+                                        marvell,function = "gpio";
+                                };
+
+                                hog_pins2: hog-pins2 {
+                                        marvell,pins = "mpp5", "mpp7", "mpp9";
+                                        marvell,function = "gpo";
+                                };
+                        };
+
                         usb@50000 {
                                 status = "okay";
                         };
@@ -112,10 +152,26 @@
                                 /* Port 0, Lane 0 */
                                 status = "okay";
                         };
+
                         pcie@2,0 {
                                 /* Port 1, Lane 0 */
                                 status = "okay";
                         };
                 };
         };
+
+        sound {
+              compatible = "marvell,a370db-audio";
+              marvell,audio-controller = <&audio_controller>;
+              marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>;
+              status = "okay";
+        };
+
+        spdif_out: spdif-out {
+              compatible = "linux,spdif-dit";
+        };
+
+        spdif_in: spdif-in {
+              compatible = "linux,spdif-dir";
+        };
 };
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 74b5964430ac..7bbc4ac997fb 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -199,6 +199,10 @@
                                 interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
                         };
 
+                        watchdog@20300 {
+                                reg = <0x20300 0x34>, <0x20704 0x4>;
+                        };
+
                         usb@50000 {
                                 compatible = "marvell,orion-ehci";
                                 reg = <0x50000 0x500>;
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index 0d8530c98cf5..af1f11e9e5a0 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -132,6 +132,25 @@
                                                         "mpp51", "mpp52", "mpp53";
                                         marvell,function = "sd0";
                                 };
+
+                                i2c0_pins: i2c0-pins {
+                                        marvell,pins = "mpp2", "mpp3";
+                                        marvell,function = "i2c0";
+                                };
+
+                                i2s_pins1: i2s-pins1 {
+                                        marvell,pins = "mpp5", "mpp6", "mpp7",
+                                                       "mpp8", "mpp9", "mpp10",
+                                                       "mpp12", "mpp13";
+                                        marvell,function = "audio";
+                                };
+
+                                i2s_pins2: i2s-pins2 {
+                                        marvell,pins = "mpp49", "mpp47", "mpp50",
+                                                       "mpp59", "mpp57", "mpp61",
+                                                       "mpp62", "mpp60", "mpp58";
+                                        marvell,function = "audio";
+                                };
                         };
 
                         gpio0: gpio@18100 {
@@ -196,6 +215,20 @@
                                 clocks = <&coreclk 2>;
                         };
 
+                        watchdog@20300 {
+                                compatible = "marvell,armada-370-wdt";
+                                clocks = <&coreclk 2>;
+                        };
+
+                        audio_controller: audio-controller@30000 {
+                                compatible = "marvell,armada370-audio";
+                                reg = <0x30000 0x4000>;
+                                interrupts = <93>;
+                                clocks = <&gateclk 0>;
+                                clock-names = "internal";
+                                status = "disabled";
+                        };
+
                         usb@50000 {
                                 clocks = <&coreclk 0>;
                         };
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index b8b84a22f0f3..abb9f9dcc525 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -111,6 +111,12 @@
                                 clock-names = "nbclk", "fixed";
                         };
 
+                        watchdog@20300 {
+                                compatible = "marvell,armada-xp-wdt";
+                                clocks = <&coreclk 2>, <&refclk>;
+                                clock-names = "nbclk", "fixed";
+                        };
+
                         armada-370-xp-pmsu@22000 {
                                 compatible = "marvell,armada-370-xp-pmsu";
                                 reg = <0x22100 0x400>, <0x20800 0x20>;
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 2b76524f4aa7..a88ed73c1c86 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -210,6 +210,14 @@
                                 clocks = <&core_clk 0>;
                         };
 
+                        watchdog@20300 {
+                                compatible = "marvell,orion-wdt";
+                                reg = <0x20300 0x28>, <0x20108 0x4>;
+                                interrupt-parent = <&bridge_intc>;
+                                interrupts = <3>;
+                                clocks = <&core_clk 0>;
+                        };
+
                         crypto: crypto-engine@30000 {
                                 compatible = "marvell,orion-crypto";
                                 reg = <0x30000 0x10000>,
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6192.dts b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
new file mode 100644
index 000000000000..e9dd85049297
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-rd88f6192.dts
@@ -0,0 +1,112 @@
+/*
+ * Marvell RD88F6192 Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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.
+ *
+ * This file contains the definitions that are common between the three
+ * variants of the Marvell Kirkwood Development Board.
+ */
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6192.dtsi"
+
+/ {
+        model = "Marvell RD88F6192 reference design";
+        compatible = "marvell,rd88f6192", "marvell,kirkwood-88f6192", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8";
+        };
+
+        mbus {
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
+        ocp@f1000000 {
+                pinctrl: pinctrl@10000 {
+                        pinctrl-0 = <&pmx_usb_power>;
+                        pinctrl-names = "default";
+
+                        pmx_usb_power: pmx-usb-power {
+                                marvell,pins = "mpp10";
+                                marvell,function = "gpo";
+                        };
+                };
+
+                serial@12000 {
+                        status = "okay";
+
+                };
+
+                spi@10600 {
+                        status = "okay";
+                        pinctrl-0 = <&pmx_spi>;
+                        pinctrl-names = "default";
+
+                        m25p128@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "st,m25p128";
+                                reg = <0>;
+                                spi-max-frequency = <20000000>;
+                                mode = <0>;
+                        };
+                };
+
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-0 = <&pmx_usb_power>;
+                pinctrl-names = "default";
+
+                usb_power: regulator@0 {
+                        compatible = "regulator-fixed";
+                        reg = <0>;
+                        regulator-name = "USB VBUS";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+                };
+        };
+};
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@8 {
+                reg = <8>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
new file mode 100644
index 000000000000..a803bbb70bc8
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-a0.dts
@@ -0,0 +1,26 @@
+/*
+ * Marvell RD88F6181 A0 Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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.
+ *
+ * This file contains the definitions for the board with the A0 variant of
+ * the SoC. The ethernet switch does not have a "wan" port.
+ */
+
+/dts-v1/;
+#include "kirkwood-rd88f6281.dtsi"
+
+/ {
+        model = "Marvell RD88f6281 Reference design, with A0 SoC";
+        compatible = "marvell,rd88f6281-a0", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        dsa@0 {
+                switch@0 {
+                        reg = <10 0>;    /* MDIO address 10, switch 0 in tree */
+                };
+        };
+};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts b/arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts
new file mode 100644
index 000000000000..baeebbf1d8c7
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281-a1.dts
@@ -0,0 +1,31 @@
+/*
+ * Marvell RD88F6181 A1 Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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.
+ *
+ * This file contains the definitions for the board with the A1 variant of
+ * the SoC. The ethernet switch has a "wan" port.
+ */
+
+/dts-v1/;
+
+#include "kirkwood-rd88f6281.dtsi"
+
+/ {
+        model = "Marvell RD88f6281 Reference design, with A1 SoC";
+        compatible = "marvell,rd88f6281-a1", "marvell,rd88f6281","marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        dsa@0 {
+                switch@0 {
+                        reg = <0 0>;    /* MDIO address 0, switch 0 in tree */
+                        port@4 {
+                                reg = <4>;
+                                label = "wan";
+                        };
+                };
+        };
+};
\ No newline at end of file
diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
new file mode 100644
index 000000000000..d6368c39102e
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -0,0 +1,152 @@
+/*
+ * Marvell RD88F6181 Common Board descrition
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * 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.
+ *
+ * This file contains the definitions that are common between the two
+ * variants of the Marvell Kirkwood Development Board.
+ */
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8";
+        };
+
+        mbus {
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
+        ocp@f1000000 {
+                pinctrl: pinctrl@10000 {
+                        pinctrl-0 = <&pmx_sdio_cd>;
+                        pinctrl-names = "default";
+
+                        pmx_sdio_cd: pmx-sdio-cd {
+                                marvell,pins = "mpp28";
+                                marvell,function = "gpio";
+                        };
+                };
+
+                serial@12000 {
+                        status = "okay";
+
+                };
+
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+                mvsdio@90000 {
+                        pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
+                        pinctrl-names = "default";
+                        status = "okay";
+                        cd-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+                        /* No WP GPIO */
+                };
+        };
+
+        dsa@0 {
+                compatible = "marvell,dsa";
+                #address-cells = <2>;
+                #size-cells = <0>;
+
+                dsa,ethernet = <&eth0>;
+                dsa,mii-bus = <&ethphy1>;
+
+                switch@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                label = "lan1";
+                        };
+
+                        port@1 {
+                                reg = <1>;
+                                label = "lan2";
+                        };
+
+                        port@2 {
+                                reg = <2>;
+                                label = "lan3";
+                        };
+
+                        port@3 {
+                                reg = <3>;
+                                label = "lan4";
+                        };
+
+                        port@5 {
+                                reg = <5>;
+                                label = "cpu";
+                        };
+                };
+       };
+};
+
+&nand {
+        status = "okay";
+
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x100000>;
+                read-only;
+        };
+
+        partition@100000 {
+                label = "uImage";
+                reg = <0x0100000 0x200000>;
+        };
+
+        partition@300000 {
+                label = "data";
+                reg = <0x0300000 0x500000>;
+        };
+};
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                reg = <0>;
+        };
+
+        ethphy1: ethernet-phy@ff {
+                reg = <0xff>; /* No PHY attached */
+                speed = <1000>;
+                duple = <1>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 6abf44d257df..85542c2f34b1 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -178,7 +178,7 @@
 
                 wdt: watchdog-timer@20300 {
                         compatible = "marvell,orion-wdt";
-                        reg = <0x20300 0x28>;
+                        reg = <0x20300 0x28>, <0x20108 0x4>;
                         interrupt-parent = <&bridge_intc>;
                         interrupts = <3>;
                         clocks = <&gate_clk 7>;