Merge tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Nov 2014 21:29:11 +0000 (22:29 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Nov 2014 21:29:11 +0000 (22:29 +0100)
Pull "mvebu DT changes for v3.19 (round 2)" from Jason Cooper:

 - mvebu
    - Use simple-card audio on Armada 370 DB
    - Add DSA node for Armada 370 DB
    - Add SDHCI to Armada 38x
    - Armada 370/XP rework to support new Synology boards
    - Add Synology DS213j and DS414
    - Various pinctrl and uart and alias fixes to help bootloaders

* tag 'mvebu-dt-3.19-2' of git://git.infradead.org/linux-mvebu:
  arm: mvebu: normalize pinctrl entries for Armada SoCs
  arm: mvebu: fix wrongly named DS414 pinctrl entries
  arm: mvebu: add .dts file for Synology DS414
  arm: mvebu: add .dts file for Synology DS213j
  arm: mvebu: define and use common Armada XP SPI pinctrl setting
  arm: mvebu: define and use common Armada XP UART2/3 pinctrl settings
  arm: mvebu: define and use common Armada 370 UART pinctrl settings
  arm: mvebu: define and use common Armada 370 SPI pinctrl settings
  arm: mvebu: move Armada 370/XP pinctrl node definition armada-370-xp.dtsi
  arm: mvebu: use recently introduced uart label for stdout-path
  arm: mvebu: add uartX labels for Armada SoC serial nodes
  arm: mvebu: fix vendor prefix typo in kirkwood-synology.dtsi
  ARM: mvebu: fix ordering in Armada 370 .dtsi
  ARM: mvebu: adjust ethernet aliases according to U-Boot requirements for A38x
  ARM: mvebu: remove clock-frequency from Armada 38x SDHCI Device Tree node
  ARM: mvebu: enable no-1-8-v flag for Armada 385 DB SDHCI interface
  mvebu: 370 RD: Add support for the switch
  ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB
  ARM: mvebu: remove conflicting muxing on Armada 370 DB

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
16 files changed:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/armada-370-db.dts
arch/arm/boot/dts/armada-370-mirabox.dts
arch/arm/boot/dts/armada-370-netgear-rn102.dts
arch/arm/boot/dts/armada-370-netgear-rn104.dts
arch/arm/boot/dts/armada-370-rd.dts
arch/arm/boot/dts/armada-370-synology-ds213j.dts [new file with mode: 0644]
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-370.dtsi
arch/arm/boot/dts/armada-385-db.dts
arch/arm/boot/dts/armada-38x.dtsi
arch/arm/boot/dts/armada-xp-axpwifiap.dts
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
arch/arm/boot/dts/armada-xp-synology-ds414.dts [new file with mode: 0644]
arch/arm/boot/dts/armada-xp.dtsi
arch/arm/boot/dts/kirkwood-synology.dtsi

index cd24e2b..35f3e12 100644 (file)
@@ -521,7 +521,8 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
        armada-370-mirabox.dtb \
        armada-370-netgear-rn102.dtb \
        armada-370-netgear-rn104.dtb \
-       armada-370-rd.dtb
+       armada-370-rd.dtb \
+       armada-370-synology-ds213j.dtb
 dtb-$(CONFIG_MACH_ARMADA_375) += \
        armada-375-db.dtb
 dtb-$(CONFIG_MACH_ARMADA_38X) += \
@@ -534,7 +535,8 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
        armada-xp-lenovo-ix4-300d.dtb \
        armada-xp-matrix.dtb \
        armada-xp-netgear-rn2120.dtb \
-       armada-xp-openblocks-ax3-4.dtb
+       armada-xp-openblocks-ax3-4.dtb \
+       armada-xp-synology-ds414.dtb
 dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
        dove-cubox.dtb \
        dove-cubox-es.dtb \
index a495e58..1466580 100644 (file)
@@ -75,6 +75,7 @@
                                clock-frequency = <100000>;
                                status = "okay";
                                audio_codec: audio-codec@4a {
+                                       #sound-dai-cells = <0>;
                                        compatible = "cirrus,cs42l51";
                                        reg = <0x4a>;
                                };
                                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";
                        };
                        };
 
                        spi0: spi@10600 {
+                               pinctrl-0 = <&spi0_pins2>;
+                               pinctrl-names = "default";
                                status = "okay";
 
                                spi-flash@0 {
        };
 
        sound {
-             compatible = "marvell,a370db-audio";
-             marvell,audio-controller = <&audio_controller>;
-             marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>;
-             status = "okay";
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "Armada 370 DB Audio";
+               simple-audio-card,mclk-fs = <256>;
+               simple-audio-card,widgets =
+                       "Headphone", "Out Jack",
+                       "Line", "In Jack";
+               simple-audio-card,routing =
+                       "Out Jack", "HPL",
+                       "Out Jack", "HPR",
+                       "AIN1L", "In Jack",
+                       "AIN1L", "In Jack";
+               status = "okay";
+
+               simple-audio-card,dai-link@0 {
+                       format = "i2s";
+                       cpu {
+                               sound-dai = <&audio_controller 0>;
+                       };
+
+                       codec {
+                               sound-dai = <&audio_codec>;
+                       };
+               };
+
+               simple-audio-card,dai-link@1 {
+                       format = "i2s";
+                       cpu {
+                               sound-dai = <&audio_controller 1>;
+                       };
+
+                       codec {
+                               sound-dai = <&spdif_out>;
+                       };
+               };
+
+               simple-audio-card,dai-link@2 {
+                       format = "i2s";
+                       cpu {
+                               sound-dai = <&audio_controller 1>;
+                       };
+
+                       codec {
+                               sound-dai = <&spdif_in>;
+                       };
+               };
        };
 
        spdif_out: spdif-out {
-             compatible = "linux,spdif-dit";
+               #sound-dai-cells = <0>;
+               compatible = "linux,spdif-dit";
        };
 
        spdif_in: spdif-in {
-             compatible = "linux,spdif-dir";
+               #sound-dai-cells = <0>;
+               compatible = "linux,spdif-dir";
+       };
+};
+
+&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";
        };
 };
index 2b6d24e..e1b0eb6 100644 (file)
                                status = "okay";
                        };
 
-                       pinctrl {
-                               pwr_led_pin: pwr-led-pin {
-                                       marvell,pins = "mpp63";
-                                       marvell,function = "gpo";
-                               };
-
-                               stat_led_pins: stat-led-pins {
-                                       marvell,pins = "mpp64", "mpp65";
-                                       marvell,function = "gpio";
-                               };
-                       };
-
                        gpio_leds {
                                compatible = "gpio-leds";
                                pinctrl-names = "default";
                };
        };
 };
+
+&pinctrl {
+       pwr_led_pin: pwr-led-pin {
+               marvell,pins = "mpp63";
+               marvell,function = "gpo";
+       };
+
+       stat_led_pins: stat-led-pins {
+               marvell,pins = "mpp64", "mpp65";
+               marvell,function = "gpio";
+       };
+};
+
index 1e38628..4e24932 100644 (file)
                                status = "okay";
                        };
 
-                       pinctrl {
-                               power_led_pin: power-led-pin {
-                                       marvell,pins = "mpp57";
-                                       marvell,function = "gpio";
-                               };
-
-                               sata1_led_pin: sata1-led-pin {
-                                       marvell,pins = "mpp15";
-                                       marvell,function = "gpio";
-                               };
-
-                               sata2_led_pin: sata2-led-pin {
-                                       marvell,pins = "mpp14";
-                                       marvell,function = "gpio";
-                               };
-
-                               backup_led_pin: backup-led-pin {
-                                       marvell,pins = "mpp56";
-                                       marvell,function = "gpio";
-                               };
-
-                               backup_button_pin: backup-button-pin {
-                                       marvell,pins = "mpp58";
-                                       marvell,function = "gpio";
-                               };
-
-                               power_button_pin: power-button-pin {
-                                       marvell,pins = "mpp62";
-                                       marvell,function = "gpio";
-                               };
-
-                               reset_button_pin: reset-button-pin {
-                                       marvell,pins = "mpp6";
-                                       marvell,function = "gpio";
-                               };
-
-                               poweroff: poweroff {
-                                       marvell,pins = "mpp8";
-                                       marvell,function = "gpio";
-                               };
-                       };
-
                        mdio {
                                pinctrl-0 = <&mdio_pins>;
                                pinctrl-names = "default";
                gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
        };
 };
+
+&pinctrl {
+       power_led_pin: power-led-pin {
+               marvell,pins = "mpp57";
+               marvell,function = "gpio";
+       };
+
+       sata1_led_pin: sata1-led-pin {
+               marvell,pins = "mpp15";
+               marvell,function = "gpio";
+       };
+
+       sata2_led_pin: sata2-led-pin {
+               marvell,pins = "mpp14";
+               marvell,function = "gpio";
+       };
+
+       backup_led_pin: backup-led-pin {
+               marvell,pins = "mpp56";
+               marvell,function = "gpio";
+       };
+
+       backup_button_pin: backup-button-pin {
+               marvell,pins = "mpp58";
+               marvell,function = "gpio";
+       };
+
+       power_button_pin: power-button-pin {
+               marvell,pins = "mpp62";
+               marvell,function = "gpio";
+       };
+
+       reset_button_pin: reset-button-pin {
+               marvell,pins = "mpp6";
+               marvell,function = "gpio";
+       };
+
+       poweroff: poweroff {
+               marvell,pins = "mpp8";
+               marvell,function = "gpio";
+       };
+};
index c2f414b..30586e4 100644 (file)
                                status = "okay";
                        };
 
-                       pinctrl {
-                               poweroff: poweroff {
-                                       marvell,pins = "mpp60";
-                                       marvell,function = "gpio";
-                               };
-
-                               backup_button_pin: backup-button-pin {
-                                       marvell,pins = "mpp52";
-                                       marvell,function = "gpio";
-                               };
-
-                               power_button_pin: power-button-pin {
-                                       marvell,pins = "mpp62";
-                                       marvell,function = "gpio";
-                               };
-
-                               backup_led_pin: backup-led-pin {
-                                       marvell,pins = "mpp63";
-                                       marvell,function = "gpo";
-                               };
-
-                               power_led_pin: power-led-pin {
-                                       marvell,pins = "mpp64";
-                                       marvell,function = "gpio";
-                               };
-
-                               reset_button_pin: reset-button-pin {
-                                       marvell,pins = "mpp65";
-                                       marvell,function = "gpio";
-                               };
-                       };
-
                        mdio {
                                pinctrl-0 = <&mdio_pins>;
                                pinctrl-names = "default";
                gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
        };
 };
+
+&pinctrl {
+       poweroff: poweroff {
+               marvell,pins = "mpp60";
+               marvell,function = "gpio";
+       };
+
+       backup_button_pin: backup-button-pin {
+               marvell,pins = "mpp52";
+               marvell,function = "gpio";
+       };
+
+       power_button_pin: power-button-pin {
+               marvell,pins = "mpp62";
+               marvell,function = "gpio";
+       };
+
+       backup_led_pin: backup-led-pin {
+               marvell,pins = "mpp63";
+               marvell,function = "gpo";
+       };
+
+       power_led_pin: power-led-pin {
+               marvell,pins = "mpp64";
+               marvell,function = "gpio";
+       };
+
+       reset_button_pin: reset-button-pin {
+               marvell,pins = "mpp65";
+               marvell,function = "gpio";
+       };
+};
index f57a8f8..3943089 100644 (file)
                };
 
                internal-regs {
-                       pinctrl {
-                               fan_pins: fan-pins {
-                                       marvell,pins = "mpp8";
-                                       marvell,function = "gpio";
-                               };
-
-                               led_pins: led-pins {
-                                       marvell,pins = "mpp32";
-                                       marvell,function = "gpio";
-                               };
-                       };
-
                        serial@12000 {
                                status = "okay";
                        };
                                phy0: ethernet-phy@0 {
                                        reg = <0>;
                                };
-
-                               phy1: ethernet-phy@1 {
-                                       reg = <1>;
-                               };
                        };
 
                        ethernet@70000 {
                                pinctrl-0 = <&ge1_rgmii_pins>;
                                pinctrl-names = "default";
                                status = "okay";
-                               phy = <&phy1>;
                                phy-mode = "rgmii-id";
+                               fixed-link {
+                                          speed = <1000>;
+                                          full-duplex;
+                               };
                        };
 
                        mvsdio@d4000 {
                        };
                };
        };
+
+       dsa@0 {
+               compatible = "marvell,dsa";
+               #address-cells = <2>;
+               #size-cells = <0>;
+
+               dsa,ethernet = <&eth1>;
+               dsa,mii-bus = <&mdio>;
+
+               switch@0 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x10 0>; /* MDIO address 16, switch 0 in tree */
+
+                       port@0 {
+                               reg = <0>;
+                               label = "lan0";
+                       };
+
+                       port@1 {
+                              reg = <1>;
+                              label = "lan1";
+                       };
+
+                       port@2 {
+                              reg = <2>;
+                              label = "lan2";
+                       };
+
+                       port@3 {
+                              reg = <3>;
+                              label = "lan3";
+                       };
+
+                       port@5 {
+                             reg = <5>;
+                             label = "cpu";
+                       };
+               };
+        };
  };
+
+&pinctrl {
+       fan_pins: fan-pins {
+               marvell,pins = "mpp8";
+               marvell,function = "gpio";
+       };
+
+       led_pins: led-pins {
+               marvell,pins = "mpp32";
+               marvell,function = "gpio";
+       };
+};
diff --git a/arch/arm/boot/dts/armada-370-synology-ds213j.dts b/arch/arm/boot/dts/armada-370-synology-ds213j.dts
new file mode 100644 (file)
index 0000000..70fecde
--- /dev/null
@@ -0,0 +1,316 @@
+/*
+ * Device Tree file for Synology DS213j
+ *
+ * Copyright (C) 2014, Arnaud EBALARD <arno@natisbad.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * Note: this Device Tree assumes that the bootloader has remapped the
+ * internal registers to 0xf1000000 (instead of the old 0xd0000000).
+ * The 0xf1000000 is the default used by the recent, DT-capable, U-Boot
+ * bootloaders provided by Marvell. It is used in recent versions of
+ * DSM software provided by Synology. Nonetheless, some earlier boards
+ * were delivered with an older version of u-boot that left internal
+ * registers mapped at 0xd0000000. If you have such a device you will
+ * not be able to directly boot a kernel based on this Device Tree. In
+ * that case, the preferred solution is to update your bootloader (e.g.
+ * by upgrading to latest version of DSM, or building a new one and
+ * installing it from u-boot prompt) or adjust the Devive Tree
+ * (s/0xf1000000/0xd0000000/ in 'ranges' below).
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "armada-370.dtsi"
+
+/ {
+       model = "Synology DS213j";
+       compatible = "synology,ds213j", "marvell,armada370",
+                    "marvell,armada-370-xp";
+
+       chosen {
+               bootargs = "console=ttyS0,115200 earlyprintk";
+               stdout-path = &uart0;
+       };
+
+       memory {
+               device_type = "memory";
+               reg = <0x00000000 0x20000000>; /* 512 MB */
+       };
+
+       soc {
+               ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+                         MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
+               internal-regs {
+
+                       /* RTC provided by Seiko S-35390A I2C RTC chip below */
+                       rtc@10300 {
+                               status = "disabled";
+                       };
+
+                       spi0: spi@10600 {
+                               status = "okay";
+
+                               spi-flash@0 {
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       compatible = "micron,n25q064";
+                                       reg = <0>; /* Chip select 0 */
+                                       spi-max-frequency = <20000000>;
+
+                                       /*
+                                        * Warning!
+                                        *
+                                        * Synology u-boot uses its compiled-in environment
+                                        * and it seems Synology did not care to change u-boot
+                                        * default configuration in order to allow saving a
+                                        * modified environment at a sensible location. So,
+                                        * if you do a 'saveenv' under u-boot, your modified
+                                        * environment will be saved at 1MB after the start
+                                        * of the flash, i.e. in the middle of the uImage.
+                                        * For that reason, it is strongly advised not to
+                                        * change the default environment, unless you know
+                                        * what you are doing.
+                                        */
+                                       partition@00000000 { /* u-boot */
+                                               label = "RedBoot";
+                                               reg = <0x00000000 0x000c0000>; /* 768KB */
+                                       };
+
+                                       partition@000c0000 { /* uImage */
+                                               label = "zImage";
+                                               reg = <0x000c0000 0x002d0000>; /* 2880KB */
+                                       };
+
+                                       partition@00390000 { /* uInitramfs */
+                                               label = "rd.gz";
+                                               reg = <0x00390000 0x00440000>; /* 4250KB */
+                                       };
+
+                                       partition@007d0000 { /* MAC address and serial number */
+                                               label = "vendor";
+                                               reg = <0x007d0000 0x00010000>; /* 64KB */
+                                       };
+
+                                       partition@007e0000 {
+                                               label = "RedBoot config";
+                                               reg = <0x007e0000 0x00010000>; /* 64KB */
+                                       };
+
+                                       partition@007f0000 {
+                                               label = "FIS directory";
+                                               reg = <0x007f0000 0x00010000>; /* 64KB */
+                                       };
+                               };
+                       };
+
+                       i2c@11000 {
+                               compatible = "marvell,mv64xxx-i2c";
+                               pinctrl-0 = <&i2c0_pins>;
+                               pinctrl-names = "default";
+                               clock-frequency = <400000>;
+                               status = "okay";
+
+                               /* Main device RTC chip */
+                               s35390a: s35390a@30 {
+                                        compatible = "sii,s35390a";
+                                        reg = <0x30>;
+                               };
+                       };
+
+                       /* Connected to a header on device's PCB */
+                       serial@12000 {
+                               status = "okay";
+                       };
+
+                       /* Connected to a TI MSP430F2111 for power control */
+                       serial@12100 {
+                               status = "okay";
+                       };
+
+                       poweroff@12100 {
+                               compatible = "synology,power-off";
+                               reg = <0x12100 0x100>;
+                               clocks = <&coreclk 0>;
+                       };
+
+                       /* rear USB port, near reset button */
+                       usb@50000 {
+                               status = "okay";
+                       };
+
+                       /* rear USB port, near RJ45 port */
+                       usb@51000 {
+                               status = "okay";
+                       };
+
+                       mdio {
+                               phy1: ethernet-phy@1 { /* Marvell 88E1512 */
+                                       reg = <1>;
+                               };
+                       };
+
+                       ethernet@70000 {
+                              status = "okay";
+                              phy = <&phy1>;
+                              phy-mode = "sgmii";
+                       };
+
+                       sata@a0000 {
+                               nr-ports = <2>;
+                               status = "okay";
+                       };
+               };
+       };
+
+       gpio-fan-32-38 {
+               status = "okay";
+               compatible = "gpio-fan";
+               pinctrl-0 = <&fan_ctrl_low_pin &fan_ctrl_mid_pin
+                            &fan_ctrl_high_pin &fan_alarm_pin>;
+               pinctrl-names = "default";
+               gpios = <&gpio1 31 GPIO_ACTIVE_HIGH
+                        &gpio2  0 GPIO_ACTIVE_HIGH
+                        &gpio2  1 GPIO_ACTIVE_HIGH>;
+               alarm-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
+               gpio-fan,speed-map = <    0 0
+                                      1000 1
+                                      1150 2
+                                      1350 4
+                                      1500 3
+                                      1650 5
+                                      1750 6
+                                      1900 7 >;
+       };
+
+       gpio-leds {
+               compatible = "gpio-leds";
+               pinctrl-0 = <&disk1_led_pin
+                            &disk2_led_pin>;
+               pinctrl-names = "default";
+
+               disk1-led-amber {
+                       label = "synology:amber:disk1";
+                       gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
+                       default-state = "keep";
+               };
+
+               disk2-led-amber {
+                       label = "synology:amber:disk2";
+                       gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
+                       default-state = "keep";
+               };
+       };
+
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin>;
+               pinctrl-names = "default";
+
+               sata1_regulator: sata1-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <1>;
+                       regulator-name = "SATA1 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <2000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+               };
+
+               sata2_regulator: sata2-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <2>;
+                       regulator-name = "SATA2 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <4000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 30 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&pinctrl {
+       disk1_led_pin: disk1-led-pin {
+               marvell,pins = "mpp31";
+               marvell,function = "gpio";
+       };
+
+       disk2_led_pin: disk2-led-pin {
+               marvell,pins = "mpp32";
+               marvell,function = "gpio";
+       };
+
+       sata1_pwr_pin: sata1-pwr-pin {
+               marvell,pins = "mpp37";
+               marvell,function = "gpio";
+       };
+
+       sata2_pwr_pin: sata2-pwr-pin {
+               marvell,pins = "mpp62";
+               marvell,function = "gpio";
+       };
+
+       sata1_pres_pin: sata1-pres-pin {
+               marvell,pins = "mpp60";
+               marvell,function = "gpio";
+       };
+
+       sata2_pres_pin: sata2-pres-pin {
+               marvell,pins = "mpp48";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit0_pin: syno-id-bit0-pin {
+               marvell,pins = "mpp55";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit1_pin: syno-id-bit1-pin {
+               marvell,pins = "mpp56";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit2_pin: syno-id-bit2-pin {
+               marvell,pins = "mpp57";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit3_pin: syno-id-bit3-pin {
+               marvell,pins = "mpp58";
+               marvell,function = "gpio";
+       };
+
+       fan_ctrl_low_pin: fan-ctrl-low-pin {
+               marvell,pins = "mpp65";
+               marvell,function = "gpio";
+       };
+
+       fan_ctrl_mid_pin: fan-ctrl-mid-pin {
+               marvell,pins = "mpp64";
+               marvell,function = "gpio";
+       };
+
+       fan_ctrl_high_pin: fan-ctrl-high-pin {
+               marvell,pins = "mpp63";
+               marvell,function = "gpo";
+       };
+
+       fan_alarm_pin: fan-alarm-pin {
+               marvell,pins = "mpp38";
+               marvell,function = "gpio";
+       };
+};
index 83286ec..83c31c8 100644 (file)
                                status = "disabled";
                        };
 
-                       serial@12000 {
+                       uart0: serial@12000 {
                                compatible = "snps,dw-apb-uart";
                                reg = <0x12000 0x100>;
                                reg-shift = <2>;
                                clocks = <&coreclk 0>;
                                status = "disabled";
                        };
-                       serial@12100 {
+
+                       uart1: serial@12100 {
                                compatible = "snps,dw-apb-uart";
                                reg = <0x12100 0x100>;
                                reg-shift = <2>;
                                status = "disabled";
                        };
 
+                       pinctrl: pin-ctrl@18000 {
+                               reg = <0x18000 0x38>;
+                       };
+
                        coredivclk: corediv-clock@18740 {
                                compatible = "marvell,armada-370-corediv-clock";
                                reg = <0x18740 0xc>;
                                status = "disabled";
                        };
 
-                       mdio {
+                       mdio: mdio {
                                #address-cells = <1>;
                                #size-cells = <0>;
                                compatible = "marvell,orion-mdio";
index 7851942..fdb3c12 100644 (file)
                                wt-override;
                        };
 
-                       i2c0: i2c@11000 {
-                               reg = <0x11000 0x20>;
+                       /*
+                        * Default SPI pinctrl setting, can be overwritten on
+                        * board level if a different configuration is used.
+                        */
+                       spi0: spi@10600 {
+                               pinctrl-0 = <&spi0_pins1>;
+                               pinctrl-names = "default";
                        };
 
-                       i2c1: i2c@11100 {
-                               reg = <0x11100 0x20>;
+                       spi1: spi@10680 {
+                               pinctrl-0 = <&spi1_pins>;
+                               pinctrl-names = "default";
                        };
 
-                       system-controller@18200 {
-                               compatible = "marvell,armada-370-xp-system-controller";
-                               reg = <0x18200 0x100>;
+                       i2c0: i2c@11000 {
+                               reg = <0x11000 0x20>;
                        };
 
-                       pinctrl {
-                               compatible = "marvell,mv88f6710-pinctrl";
-                               reg = <0x18000 0x38>;
-
-                               sdio_pins1: sdio-pins1 {
-                                       marvell,pins = "mpp9",  "mpp11", "mpp12",
-                                                       "mpp13", "mpp14", "mpp15";
-                                       marvell,function = "sd0";
-                               };
-
-                               sdio_pins2: sdio-pins2 {
-                                       marvell,pins = "mpp47", "mpp48", "mpp49",
-                                                       "mpp50", "mpp51", "mpp52";
-                                       marvell,function = "sd0";
-                               };
-
-                               sdio_pins3: sdio-pins3 {
-                                       marvell,pins = "mpp48", "mpp49", "mpp50",
-                                                       "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";
-                               };
-
-                               mdio_pins: mdio-pins {
-                                       marvell,pins = "mpp17", "mpp18";
-                                       marvell,function = "ge";
-                               };
-
-                               ge0_rgmii_pins: ge0-rgmii-pins {
-                                       marvell,pins = "mpp5", "mpp6", "mpp7", "mpp8",
-                                                      "mpp9", "mpp10", "mpp11", "mpp12",
-                                                      "mpp13", "mpp14", "mpp15", "mpp16";
-                                       marvell,function = "ge0";
-                               };
-
-                               ge1_rgmii_pins: ge1-rgmii-pins {
-                                       marvell,pins = "mpp19", "mpp20", "mpp21", "mpp22",
-                                                      "mpp23", "mpp24", "mpp25", "mpp26",
-                                                      "mpp27", "mpp28", "mpp29", "mpp30";
-                                       marvell,function = "ge1";
-                               };
+                       i2c1: i2c@11100 {
+                               reg = <0x11100 0x20>;
                        };
 
                        gpio0: gpio@18100 {
                                interrupts = <91>;
                        };
 
+                       /*
+                        * Default UART pinctrl setting without RTS/CTS, can
+                        * be overwritten on board level if a different
+                        * configuration is used.
+                        */
+                       uart0: serial@12000 {
+                               pinctrl-0 = <&uart0_pins>;
+                               pinctrl-names = "default";
+                       };
+
+                       uart1: serial@12100 {
+                               pinctrl-0 = <&uart1_pins>;
+                               pinctrl-names = "default";
+                       };
+
+                       system-controller@18200 {
+                               compatible = "marvell,armada-370-xp-system-controller";
+                               reg = <0x18200 0x100>;
+                       };
+
                        gateclk: clock-gating-control@18220 {
                                compatible = "marvell,armada-370-gating-clock";
                                reg = <0x18220 0x4>;
                        };
 
                        audio_controller: audio-controller@30000 {
+                               #sound-dai-cells = <1>;
                                compatible = "marvell,armada370-audio";
                                reg = <0x30000 0x4000>;
                                interrupts = <93>;
                };
        };
 };
+
+&pinctrl {
+       compatible = "marvell,mv88f6710-pinctrl";
+
+       spi0_pins1: spi0-pins1 {
+               marvell,pins = "mpp33", "mpp34",
+                              "mpp35", "mpp36";
+               marvell,function = "spi0";
+       };
+
+       spi0_pins2: spi0_pins2 {
+               marvell,pins = "mpp32", "mpp63",
+                              "mpp64", "mpp65";
+               marvell,function = "spi0";
+       };
+
+       spi1_pins: spi1-pins {
+               marvell,pins = "mpp49", "mpp50",
+                              "mpp51", "mpp52";
+               marvell,function = "spi1";
+       };
+
+       uart0_pins: uart0-pins {
+               marvell,pins = "mpp0", "mpp1";
+               marvell,function = "uart0";
+       };
+
+       uart1_pins: uart1-pins {
+               marvell,pins = "mpp41", "mpp42";
+               marvell,function = "uart1";
+       };
+
+       sdio_pins1: sdio-pins1 {
+               marvell,pins = "mpp9",  "mpp11", "mpp12",
+                               "mpp13", "mpp14", "mpp15";
+               marvell,function = "sd0";
+       };
+
+       sdio_pins2: sdio-pins2 {
+               marvell,pins = "mpp47", "mpp48", "mpp49",
+                               "mpp50", "mpp51", "mpp52";
+               marvell,function = "sd0";
+       };
+
+       sdio_pins3: sdio-pins3 {
+               marvell,pins = "mpp48", "mpp49", "mpp50",
+                               "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";
+       };
+
+       mdio_pins: mdio-pins {
+               marvell,pins = "mpp17", "mpp18";
+               marvell,function = "ge";
+       };
+
+       ge0_rgmii_pins: ge0-rgmii-pins {
+               marvell,pins = "mpp5", "mpp6", "mpp7", "mpp8",
+                              "mpp9", "mpp10", "mpp11", "mpp12",
+                              "mpp13", "mpp14", "mpp15", "mpp16";
+               marvell,function = "ge0";
+       };
+
+       ge1_rgmii_pins: ge1-rgmii-pins {
+               marvell,pins = "mpp19", "mpp20", "mpp21", "mpp22",
+                              "mpp23", "mpp24", "mpp25", "mpp26",
+                              "mpp27", "mpp28", "mpp29", "mpp30";
+               marvell,function = "ge1";
+       };
+};
index 1af886f..2aaa9d2 100644 (file)
                        };
 
                        sdhci@d8000 {
-                               clock-frequency = <200000000>;
                                broken-cd;
                                wp-inverted;
                                bus-width = <8>;
                                status = "okay";
+                               no-1-8-v;
                        };
 
                        usb3@f0000 {
index 242d0ec..74391da 100644 (file)
@@ -25,9 +25,9 @@
        aliases {
                gpio0 = &gpio0;
                gpio1 = &gpio1;
-               eth0 = &eth0;
-               eth1 = &eth1;
-               eth2 = &eth2;
+               ethernet0 = &eth0;
+               ethernet1 = &eth1;
+               ethernet2 = &eth2;
        };
 
        soc {
index 0e53fad..ca0200e 100644 (file)
                        };
 
                        ethernet@70000 {
-                               pinctrl-0 = <&pmx_ge0_rgmii>;
+                               pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
                                status = "okay";
                                phy = <&phy0>;
                                phy-mode = "rgmii-id";
                        };
                        ethernet@74000 {
-                               pinctrl-0 = <&pmx_ge1_rgmii>;
+                               pinctrl-0 = <&ge1_rgmii_pins>;
                                pinctrl-names = "default";
                                status = "okay";
                                phy = <&phy1>;
 
                        spi0: spi@10600 {
                                status = "okay";
-                               pinctrl-0 = <&pmx_spi>;
-                               pinctrl-names = "default";
 
                                spi-flash@0 {
                                        #address-cells = <1>;
                compatible = "gpio-keys";
                #address-cells = <1>;
                #size-cells = <0>;
-               pinctrl-0 = <&pmx_keys>;
+               pinctrl-0 = <&keys_pin>;
                pinctrl-names = "default";
 
                button@1 {
 };
 
 &pinctrl {
-       pinctrl-0 = <&pmx_phy_int>;
+       pinctrl-0 = <&phy_int_pin>;
        pinctrl-names = "default";
 
-       pmx_keys: pmx-keys {
+       keys_pin: keys-pin {
                marvell,pins = "mpp33";
                marvell,function = "gpio";
        };
 
-       pmx_spi: pmx-spi {
-               marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
-               marvell,function = "spi";
-       };
-
-       pmx_phy_int: pmx-phy-int {
+       phy_int_pin: phy-int-pin {
                marvell,pins = "mpp32";
                marvell,function = "gpio";
        };
index aa5463c..a2ef93c 100644 (file)
@@ -22,7 +22,7 @@
 
        chosen {
                bootargs = "console=ttyS0,115200 earlyprintk";
-               stdout-path = "/soc/internal-regs/serial@12000";
+               stdout-path = &uart0;
        };
 
        memory {
@@ -66,7 +66,7 @@
                        };
 
                        ethernet@70000 {
-                               pinctrl-0 = <&pmx_ge0_rgmii>;
+                               pinctrl-0 = <&ge0_rgmii_pins>;
                                pinctrl-names = "default";
                                status = "okay";
                                phy = <&phy0>;
@@ -74,7 +74,7 @@
                        };
 
                        ethernet@74000 {
-                               pinctrl-0 = <&pmx_ge1_rgmii>;
+                               pinctrl-0 = <&ge1_rgmii_pins>;
                                pinctrl-names = "default";
                                status = "okay";
                                phy = <&phy1>;
diff --git a/arch/arm/boot/dts/armada-xp-synology-ds414.dts b/arch/arm/boot/dts/armada-xp-synology-ds414.dts
new file mode 100644 (file)
index 0000000..749fdba
--- /dev/null
@@ -0,0 +1,330 @@
+/*
+ * Device Tree file for Synology DS414
+ *
+ * Copyright (C) 2014, Arnaud EBALARD <arno@natisbad.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * Note: this Device Tree assumes that the bootloader has remapped the
+ * internal registers to 0xf1000000 (instead of the old 0xd0000000).
+ * The 0xf1000000 is the default used by the recent, DT-capable, U-Boot
+ * bootloaders provided by Marvell. It is used in recent versions of
+ * DSM software provided by Synology. Nonetheless, some earlier boards
+ * were delivered with an older version of u-boot that left internal
+ * registers mapped at 0xd0000000. If you have such a device you will
+ * not be able to directly boot a kernel based on this Device Tree. In
+ * that case, the preferred solution is to update your bootloader (e.g.
+ * by upgrading to latest version of DSM, or building a new one and
+ * installing it from u-boot prompt) or adjust the Devive Tree
+ * (s/0xf1000000/0xd0000000/ in 'ranges' below).
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include "armada-xp-mv78230.dtsi"
+
+/ {
+       model = "Synology DS414";
+       compatible = "synology,ds414", "marvell,armadaxp-mv78230",
+                    "marvell,armadaxp", "marvell,armada-370-xp";
+
+       chosen {
+               bootargs = "console=ttyS0,115200 earlyprintk";
+               stdout-path = &uart0;
+       };
+
+       memory {
+               device_type = "memory";
+               reg = <0 0x00000000 0 0x40000000>; /* 1GB */
+       };
+
+       soc {
+               ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
+                         MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
+
+               pcie-controller {
+                       status = "okay";
+
+                       /*
+                        * Connected to Marvell 88SX7042 SATA-II controller
+                        * handling the four disks.
+                        */
+                       pcie@1,0 {
+                               /* Port 0, Lane 0 */
+                               status = "okay";
+                       };
+
+                       /*
+                        * Connected to EtronTech EJ168A XHCI controller
+                        * providing the two rear USB 3.0 ports.
+                        */
+                       pcie@5,0 {
+                               /* Port 1, Lane 0 */
+                               status = "okay";
+                       };
+               };
+
+               internal-regs {
+
+                       /* RTC is provided by Seiko S-35390A below */
+                       rtc@10300 {
+                               status = "disabled";
+                       };
+
+                       spi0: spi@10600 {
+                               status = "okay";
+
+                               spi-flash@0 {
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       compatible = "micron,n25q064";
+                                       reg = <0>; /* Chip select 0 */
+                                       spi-max-frequency = <20000000>;
+
+                                       /*
+                                        * Warning!
+                                        *
+                                        * Synology u-boot uses its compiled-in environment
+                                        * and it seems Synology did not care to change u-boot
+                                        * default configuration in order to allow saving a
+                                        * modified environment at a sensible location. So,
+                                        * if you do a 'saveenv' under u-boot, your modified
+                                        * environment will be saved at 1MB after the start
+                                        * of the flash, i.e. in the middle of the uImage.
+                                        * For that reason, it is strongly advised not to
+                                        * change the default environment, unless you know
+                                        * what you are doing.
+                                        */
+                                       partition@00000000 { /* u-boot */
+                                               label = "RedBoot";
+                                               reg = <0x00000000 0x000d0000>; /* 832KB */
+                                       };
+
+                                       partition@000c0000 { /* uImage */
+                                               label = "zImage";
+                                               reg = <0x000d0000 0x002d0000>; /* 2880KB */
+                                       };
+
+                                       partition@003a0000 { /* uInitramfs */
+                                               label = "rd.gz";
+                                               reg = <0x003a0000 0x00430000>; /* 4250KB */
+                                       };
+
+                                       partition@007d0000 { /* MAC address and serial number */
+                                               label = "vendor";
+                                               reg = <0x007d0000 0x00010000>; /* 64KB */
+                                       };
+
+                                       partition@007e0000 {
+                                               label = "RedBoot config";
+                                               reg = <0x007e0000 0x00010000>; /* 64KB */
+                                       };
+
+                                       partition@007f0000 {
+                                               label = "FIS directory";
+                                               reg = <0x007f0000 0x00010000>; /* 64KB */
+                                       };
+                               };
+                       };
+
+                       i2c@11000 {
+                               clock-frequency = <400000>;
+                               status = "okay";
+
+                               s35390a: s35390a@30 {
+                                        compatible = "sii,s35390a";
+                                        reg = <0x30>;
+                               };
+                       };
+
+                       /* Connected to a header on device's PCB. This
+                        * provides the main console for the device.
+                        *
+                        * Warning: the device may not boot with a 3.3V
+                        * USB-serial converter connected when the power
+                        * button is pressed. The converter needs to be
+                        * connected a few seconds after pressing the
+                        * power button. This is possibly due to UART0_TXD
+                        * pin being sampled at reset (bit 0 of SAR).
+                        */
+                       serial@12000 {
+                               status = "okay";
+                       };
+
+                       /* Connected to a Microchip PIC16F883 for power control */
+                       serial@12100 {
+                               status = "okay";
+                       };
+
+                       poweroff@12100 {
+                               compatible = "synology,power-off";
+                               reg = <0x12100 0x100>;
+                               clocks = <&coreclk 0>;
+                       };
+
+                       /* Front USB 2.0 port */
+                       usb@50000 {
+                               status = "okay";
+                       };
+
+                       mdio {
+                               phy0: ethernet-phy@0 { /* Marvell 88E1512 */
+                                       reg = <0>;
+                               };
+
+                               phy1: ethernet-phy@1 { /* Marvell 88E1512 */
+                                       reg = <1>;
+                               };
+                       };
+
+                       ethernet@70000 {
+                               status = "okay";
+                               pinctrl-0 = <&ge0_rgmii_pins>;
+                               pinctrl-names = "default";
+                               phy = <&phy1>;
+                               phy-mode = "rgmii-id";
+                       };
+
+                       ethernet@74000 {
+                               pinctrl-0 = <&ge1_rgmii_pins>;
+                               pinctrl-names = "default";
+                               status = "okay";
+                               phy = <&phy0>;
+                               phy-mode = "rgmii-id";
+                       };
+               };
+       };
+
+       regulators {
+               compatible = "simple-bus";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-0 = <&sata1_pwr_pin &sata2_pwr_pin
+                            &sata3_pwr_pin &sata4_pwr_pin>;
+               pinctrl-names = "default";
+
+               sata1_regulator: sata1-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <1>;
+                       regulator-name = "SATA1 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <2000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+               };
+
+               sata2_regulator: sata2-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <2>;
+                       regulator-name = "SATA2 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <4000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;
+               };
+
+               sata3_regulator: sata3-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <3>;
+                       regulator-name = "SATA3 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <6000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+               };
+
+               sata4_regulator: sata4-regulator {
+                       compatible = "regulator-fixed";
+                       reg = <4>;
+                       regulator-name = "SATA4 Power";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       startup-delay-us = <8000000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+                       gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&pinctrl {
+       sata1_pwr_pin: sata1-pwr-pin {
+               marvell,pins = "mpp42";
+               marvell,function = "gpio";
+       };
+
+       sata2_pwr_pin: sata2-pwr-pin {
+               marvell,pins = "mpp44";
+               marvell,function = "gpio";
+       };
+
+       sata3_pwr_pin: sata3-pwr-pin {
+               marvell,pins = "mpp45";
+               marvell,function = "gpio";
+       };
+
+       sata4_pwr_pin: sata4-pwr-pin {
+               marvell,pins = "mpp46";
+               marvell,function = "gpio";
+       };
+
+       sata1_pres_pin: sata1-pres-pin {
+               marvell,pins = "mpp34";
+               marvell,function = "gpio";
+       };
+
+       sata2_pres_pin: sata2-pres-pin {
+               marvell,pins = "mpp35";
+               marvell,function = "gpio";
+       };
+
+       sata3_pres_pin: sata3-pres-pin {
+               marvell,pins = "mpp40";
+               marvell,function = "gpio";
+       };
+
+       sata4_pres_pin: sata4-pres-pin {
+               marvell,pins = "mpp41";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit0_pin: syno-id-bit0-pin {
+               marvell,pins = "mpp26";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit1_pin: syno-id-bit1-pin {
+               marvell,pins = "mpp28";
+               marvell,function = "gpio";
+       };
+
+       syno_id_bit2_pin: syno-id-bit2-pin {
+               marvell,pins = "mpp29";
+               marvell,function = "gpio";
+       };
+
+       fan1_alarm_pin: fan1-alarm-pin {
+               marvell,pins = "mpp33";
+               marvell,function = "gpio";
+       };
+
+       fan2_alarm_pin: fan2-alarm-pin {
+               marvell,pins = "mpp32";
+               marvell,function = "gpio";
+       };
+};
index a3919b6..a2a6451 100644 (file)
                                wt-override;
                        };
 
+                       spi0: spi@10600 {
+                               pinctrl-0 = <&spi0_pins>;
+                               pinctrl-names = "default";
+                       };
+
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
                                reg = <0x11000 0x100>;
                                reg = <0x11100 0x100>;
                        };
 
-                       serial@12200 {
+                       uart2: serial@12200 {
                                compatible = "snps,dw-apb-uart";
+                               pinctrl-0 = <&uart2_pins>;
+                               pinctrl-names = "default";
                                reg = <0x12200 0x100>;
                                reg-shift = <2>;
                                interrupts = <43>;
                                clocks = <&coreclk 0>;
                                status = "disabled";
                        };
-                       serial@12300 {
+
+                       uart3: serial@12300 {
                                compatible = "snps,dw-apb-uart";
+                               pinctrl-0 = <&uart3_pins>;
+                               pinctrl-names = "default";
                                reg = <0x12300 0x100>;
                                reg-shift = <2>;
                                interrupts = <44>;
                                status = "disabled";
                        };
 
-                       pinctrl: pin-ctrl@18000 {
-                               reg = <0x18000 0x38>;
-
-                               pmx_ge0_gmii: pmx-ge0-gmii {
-                                       marvell,pins =
-                                            "mpp0",  "mpp1",  "mpp2",  "mpp3",
-                                            "mpp4",  "mpp5",  "mpp6",  "mpp7",
-                                            "mpp8",  "mpp9",  "mpp10", "mpp11",
-                                            "mpp12", "mpp13", "mpp14", "mpp15",
-                                            "mpp16", "mpp17", "mpp18", "mpp19",
-                                            "mpp20", "mpp21", "mpp22", "mpp23";
-                                       marvell,function = "ge0";
-                               };
-
-                               pmx_ge0_rgmii: pmx-ge0-rgmii {
-                                       marvell,pins =
-                                            "mpp0", "mpp1", "mpp2", "mpp3",
-                                            "mpp4", "mpp5", "mpp6", "mpp7",
-                                            "mpp8", "mpp9", "mpp10", "mpp11";
-                                       marvell,function = "ge0";
-                               };
-
-                               pmx_ge1_rgmii: pmx-ge1-rgmii {
-                                       marvell,pins =
-                                            "mpp12", "mpp13", "mpp14", "mpp15",
-                                            "mpp16", "mpp17", "mpp18", "mpp19",
-                                            "mpp20", "mpp21", "mpp22", "mpp23";
-                                       marvell,function = "ge1";
-                               };
-
-                               sdio_pins: sdio-pins {
-                                       marvell,pins = "mpp30", "mpp31", "mpp32",
-                                                      "mpp33", "mpp34", "mpp35";
-                                       marvell,function = "sd0";
-                               };
-                       };
-
                        system-controller@18200 {
                                compatible = "marvell,armada-370-xp-system-controller";
                                reg = <0x18200 0x500>;
                };
        };
 };
+
+&pinctrl {
+       ge0_gmii_pins: ge0-gmii-pins {
+               marvell,pins =
+                    "mpp0",  "mpp1",  "mpp2",  "mpp3",
+                    "mpp4",  "mpp5",  "mpp6",  "mpp7",
+                    "mpp8",  "mpp9",  "mpp10", "mpp11",
+                    "mpp12", "mpp13", "mpp14", "mpp15",
+                    "mpp16", "mpp17", "mpp18", "mpp19",
+                    "mpp20", "mpp21", "mpp22", "mpp23";
+               marvell,function = "ge0";
+       };
+
+       ge0_rgmii_pins: ge0-rgmii-pins {
+               marvell,pins =
+                    "mpp0", "mpp1", "mpp2", "mpp3",
+                    "mpp4", "mpp5", "mpp6", "mpp7",
+                    "mpp8", "mpp9", "mpp10", "mpp11";
+               marvell,function = "ge0";
+       };
+
+       ge1_rgmii_pins: ge1-rgmii-pins {
+               marvell,pins =
+                    "mpp12", "mpp13", "mpp14", "mpp15",
+                    "mpp16", "mpp17", "mpp18", "mpp19",
+                    "mpp20", "mpp21", "mpp22", "mpp23";
+               marvell,function = "ge1";
+       };
+
+       sdio_pins: sdio-pins {
+               marvell,pins = "mpp30", "mpp31", "mpp32",
+                              "mpp33", "mpp34", "mpp35";
+               marvell,function = "sd0";
+       };
+
+       spi0_pins: spi0-pins {
+               marvell,pins = "mpp36", "mpp37",
+                              "mpp38", "mpp39";
+               marvell,function = "spi";
+       };
+
+       uart2_pins: uart2-pins {
+               marvell,pins = "mpp42", "mpp43";
+               marvell,function = "uart2";
+       };
+
+       uart3_pins: uart3-pins {
+               marvell,pins = "mpp44", "mpp45";
+               marvell,function = "uart3";
+       };
+};
index 811e097..8be5b2e 100644 (file)
 
                        s35390a: s35390a@30 {
                                status = "disabled";
-                               compatible = "ssi,s35390a";
+                               compatible = "sii,s35390a";
                                reg = <0x30>;
                        };
                };