On Sun, Nov 16, 2014 at 01:04:23AM +0100, Arnaud Ebalard wrote: > > Synology DS213j is a 2-bay NAS powered by a Marvell Armada 370 > (88F6710 @1.2Ghz). It is very similar on many aspects to previous > 2-bay synology models based on Marvell kirkwood SoC. Here is a > short summary of the device: > > - 512MB RAM > - boot on SPI flash (64Mbit Micron N25Q064) > - 1 GbE interface (Armada MAC connected to a Marvell 88E1512 > PHY via SGMII) > - 2 rear USB 2.0 ports (directly handled by the Armada 370) > - 2 internal SATA ports handled by the Armada 370: 2 GPIO for > presence, 2 for powering them > - two front amber LED (disk1, disk2) controlled by the SoC > - Seiko S-35390A I2C RTC chip > - UART0 providing serial console > - UART1 used for poweroff (connected to a TI MSP430F2111) > - Fan handled via 4 GPIO (3 for speed, 1 for alarm) > > Signed-off-by: Arnaud Ebalard <arno@xxxxxxxxxxxx> > --- > arch/arm/boot/dts/Makefile | 3 +- > arch/arm/boot/dts/armada-370-synology-ds213j.dts | 351 +++++++++++++++++++++++ > 2 files changed, 353 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/boot/dts/armada-370-synology-ds213j.dts > > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile > index 38c89cafa1ab..95387b59ebb2 100644 > --- a/arch/arm/boot/dts/Makefile > +++ b/arch/arm/boot/dts/Makefile > @@ -495,7 +495,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) += \ > 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 > index 000000000000..3cba5c7d36f1 > --- /dev/null > +++ b/arch/arm/boot/dts/armada-370-synology-ds213j.dts > @@ -0,0 +1,351 @@ > +/* > + * Device Tree file for Synology DS213j > + * > + * Copyright (C) 2014, Arnaud EBALARD <arno@xxxxxxxxxxxx> > + * > + * 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 { > + > + sata@a0000 { > + nr-ports = <2>; > + status = "okay"; > + }; > + > + pinctrl { > + pmx_ge0: pmx-ge0 { > + marvell,pins = "mpp5", "mpp6", "mpp7", "mpp8", > + "mpp9", "mpp10", "mpp11", "mpp12", > + "mpp13", "mpp14", "mpp15", "mpp16"; > + marvell,function = "ge0"; > + }; This is already available in armada-370.dtsi as ge0_rgmii_pins. > + > + pmx_uart0: pmx-uart0 { > + marvell,pins = "mpp0", "mpp1"; > + marvell,function = "uart0"; > + }; This however does not seem to be in armada-370.dtsi. This is probably because there are a few options: MPP_FUNCTION(0x0, "gpio", NULL), MPP_FUNCTION(0x1, "uart0", "rxd")), MPP_MODE(1, MPP_FUNCTION(0x0, "gpo", NULL), MPP_FUNCTION(0x1, "uart0", "txd")), MPP_MODE(2, MPP_FUNCTION(0x0, "gpio", NULL), MPP_FUNCTION(0x1, "i2c0", "sck"), MPP_FUNCTION(0x2, "uart0", "txd")), MPP_MODE(3, MPP_FUNCTION(0x0, "gpio", NULL), MPP_FUNCTION(0x1, "i2c0", "sda"), MPP_FUNCTION(0x2, "uart0", "rxd")), What we found with Kirkwood, is that everybody picks the same. Probably because of Marvell's RDK and U-boot etc. It is not clear from the current 370 boards what is being used. I should go look at Mirabox and 370 RD. If they are all mpp0 & mpp1, i suggest we put this into armada-370.dtsi > + > + pmx_i2c: pmx-i2c { > + marvell,pins = "mpp2", "mpp3"; > + marvell,function = "i2c0"; > + }; i2c0_pins > + pmx_spi: pmx-spi { > + marvell,pins = "mpp33", "mpp34", > + "mpp35", "mpp36"; > + marvell,function = "spi0"; > + }; Again, we might want to put this in armada-370.dtsi. > + pmx_disk1_led: pmx-disk1-led { > + marvell,pins = "mpp31"; > + marvell,function = "gpio"; > + }; > + > + pmx_disk2_led: pmx-disk2-led { > + marvell,pins = "mpp32"; > + marvell,function = "gpio"; > + }; > + > + pmx_sata1_pwr: pmx-sata1-pwr { > + marvell,pins = "mpp37"; > + marvell,function = "gpio"; > + }; > + > + pmx_sata2_pwr: pmx-sata2-pwr { > + marvell,pins = "mpp62"; > + marvell,function = "gpio"; > + }; > + > + pmx_sata1_pres: pmx-sata1-pres { > + marvell,pins = "mpp60"; > + marvell,function = "gpio"; > + }; > + > + pmx_sata2_pres: pmx-sata2-pres { > + marvell,pins = "mpp48"; > + marvell,function = "gpio"; > + }; > + > + pmx_smi: pmx-smi { > + marvell,pins = "mpp17", "mpp18"; > + marvell,function = "ge"; > + }; mdio_pins > + pmx_syno_id_bit0: pmx-syno-id-bit0 { > + marvell,pins = "mpp55"; > + marvell,function = "gpio"; > + }; > + > + pmx_syno_id_bit1: pmx-syno-id-bit1 { > + marvell,pins = "mpp56"; > + marvell,function = "gpio"; > + }; > + > + pmx_syno_id_bit2: pmx-syno-id-bit2 { > + marvell,pins = "mpp57"; > + marvell,function = "gpio"; > + }; > + > + pmx_syno_id_bit3: pmx-syno-id-bit3 { > + marvell,pins = "mpp58"; > + marvell,function = "gpio"; > + }; > + > + pmx_fan_ctrl_low: pmx-fan-ctrl-low { > + marvell,pins = "mpp65"; > + marvell,function = "gpio"; > + }; > + > + pmx_fan_ctrl_mid: pmx-fan-ctrl-mid { > + marvell,pins = "mpp64"; > + marvell,function = "gpio"; > + }; > + > + pmx_fan_ctrl_high: pmx-fan-ctrl-high { > + marvell,pins = "mpp63"; > + marvell,function = "gpo"; > + }; > + > + pmx_fan_alarm: pmx-fan-alarm { > + marvell,pins = "mpp38"; > + marvell,function = "gpio"; > + }; > + > + pmx_poweroff: pmx-poweroff { > + marvell,pins = "mpp4"; > + marvell,function = "gpio"; > + }; > + }; > + > + mdio { > + phy1: ethernet-phy@1 { /* Marvell 88E1512 */ > + reg = <1>; > + }; > + }; > + > + ethernet@70000 { > + status = "okay"; > + pinctrl-0 = <&pmx_ge0>; > + pinctrl-names = "default"; > + phy = <&phy1>; > + phy-mode = "sgmii"; > + }; > + > + spi0: spi@10600 { > + status = "okay"; > + pinctrl-0 = <&pmx_spi>; > + pinctrl-names = "default"; > + > + 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 be saved will at 1MB after the start * 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 default environment, unless you know what * 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 */ > + }; > + }; > + }; > + > + /* rear USB port, near reset button */ > + usb@50000 { > + status = "okay"; > + }; > + > + /* rear USB port, near RJ45 port */ > + usb@51000 { > + status = "okay"; > + }; > + > + i2c@11000 { > + compatible = "marvell,mv64xxx-i2c"; > + clock-frequency = <400000>; > + status = "okay"; > + > + /* Main device RTC chip */ > + s35390a: s35390a@30 { > + compatible = "ssi,s35390a"; sii not ssi. > + reg = <0x30>; > + }; > + }; > + > + /* RTC provided by Seiko S-35390A above */ > + rtc@10300 { > + status = "disabled"; > + }; > + > + /* 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>; > + }; > + }; > + }; > + > + gpio-fan-100-32-35 { There is some logic to this naming, but i don't remember what it is. Did you check this is appropriate? > + status = "okay"; > + compatible = "gpio-fan"; > + pinctrl-0 = <&pmx_fan_ctrl_low &pmx_fan_ctrl_mid > + &pmx_fan_ctrl_high &pmx_fan_alarm>; > + 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 > + 2200 1 > + 2500 2 > + 3000 4 > + 3300 3 > + 3700 5 > + 3800 6 > + 4200 7 >; > + }; > + > + gpio-leds { > + compatible = "gpio-leds"; > + pinctrl-0 = <&pmx_disk1_led > + &pmx_disk2_led>; > + 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 = <&pmx_sata1_pwr &pmx_sata2_pwr>; > + 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>; > + }; > + }; > +}; > -- > 2.1.1 > > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html