| Message ID | 87bo1qhfnf.fsf@natisbad.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/11/2013 09:01 PM, Arnaud Ebalard wrote: > All hardware parts of the (mv78230 Armada XP based) NETGEAR ReadyNAS > 2120 are supported by mainline kernel (USB 3.0 and eSATA rear ports, > USB 2.0 front port, Gigabit controller and PHYs for the two rear ports, > serial port, LEDs, Buttons, 88SE9170 SATA controllers, three G762 fan > controllers, G751 temperature sensor) except for: > > - the Intersil ISL12057 I2C RTC Chip, > - the Armada NAND controller. > > Support for both of those is currently work in progress and does not > prevent boot. > > Signed-off-by: Arnaud Ebalard <arno@natisbad.org> > --- [...] > diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > new file mode 100644 > index 0000000..ba1e0de > --- /dev/null > +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts > @@ -0,0 +1,288 @@ > +/* > + * Device Tree file for NETGEAR ReadyNAS 2120 > + * > + * Copyright (C) 2013, 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. > + */ > + > +/dts-v1/; > + > +#include "armada-xp-mv78230.dtsi" > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> nit: order includes global before local, i.e. {gpio,input}.h before .dtsi > +/ { > + model = "NETGEAR ReadyNAS 2120"; > + compatible = "netgear,readynas-2120", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp"; > + > + chosen { > + bootargs = "console=ttyS0,115200 earlyprintk"; > + }; > + > + memory { > + device_type = "memory"; > + reg = <0 0x00000000 0 0x80000000>; /* 2GB */ > + }; > + [...] > + serial@12000 { > + clocks = <&coreclk 0>; > + status = "okay"; > + }; For your possible cleanup later: move clocks = <&coreclk 0> to armada-370-xp.dtsi and remove this then. Also for cleanup later: It would be great if most SoC nodes get a node label. That way you can just write: uart0: { status = "okay" }; without replaying node hierarchy over and over again. > + mdio { > + phy0: ethernet-phy@0 { > + compatible = "marvell,88e1318s"; > + reg = <0>; > + }; > + > + phy1: ethernet-phy@1 { > + compatible = "marvell,88e1318s"; > + reg = <1>; > + }; > + }; > + > + ethernet@70000 { > + status = "okay"; > + phy = <&phy0>; > + phy-mode = "rgmii-id"; > + }; > + > + ethernet@74000 { > + status = "okay"; > + phy = <&phy1>; > + phy-mode = "rgmii-id"; > + }; > + > + /* Front USB 2.0 port */ > + usb@50000 { > + status = "okay"; > + }; > + > + i2c@11000 { > + compatible = "marvell,mv78230-i2c"; > + clock-frequency = <400000>; > + status = "okay"; > + > + /* Controller for rear fan #1 of 3 (Protechnic > + * MGT4012XB-O20, 8000RPM) near eSATA port */ > + g762_fan1: g762@3e { > + compatible = "gmt,g762"; > + reg = <0x3e>; > + clocks = <&g762_clk>; /* input clock */ > + fan_gear_mode = <0>; > + fan_startv = <1>; > + pwm_polarity = <0>; I haven't looked at g762 dt-bindings, but above properties should have s/_/- and possibly also vendor prefix if device specific, e.g. gmt,fan-hear-mode. Depends on your g762 binding review. > + }; > + > + /* Controller for rear (center) fan #2 of 3 */ > + g762_fan2: g762@48 { > + compatible = "gmt,g762"; > + reg = <0x48>; > + clocks = <&g762_clk>; /* input clock */ > + fan_gear_mode = <0>; > + fan_startv = <1>; > + pwm_polarity = <0>; > + }; > + > + /* Controller for rear fan #3 of 3 */ > + g762_fan3: g762@49 { > + compatible = "gmt,g762"; > + reg = <0x49>; > + clocks = <&g762_clk>; /* input clock */ > + fan_gear_mode = <0>; > + fan_startv = <1>; > + pwm_polarity = <0>; > + }; > + > + /* Temperature sensor */ > + g751: g751@4c { > + compatible = "gmt,g751"; > + reg = <0x4c>; > + }; > + }; > + }; > + }; > + > + clocks { > + g762_clk: g762_oscillator { While node labels have '_', node names usually have '-'. > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <32768>; > + }; > + }; > + > + gpio_leds { > + compatible = "gpio-leds"; > + pinctrl-0 = <&sata1_led_pin &sata2_led_pin &err_led_pin > + &sata3_led_pin &sata4_led_pin>; > + pinctrl-names = "default"; > + > + red_sata1_led { ditto here and below. > + label = "rn2120:red:sata1"; > + gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; > + default-state = "off"; > + }; > + > + red_sata2_led { > + label = "rn2120:red:sata2"; > + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; > + default-state = "off"; > + }; > + > + red_sata3_led { > + label = "rn2120:red:sata3"; > + gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; > + default-state = "off"; > + }; > + > + red_sata4_led { > + label = "rn2120:red:sata4"; > + gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; > + default-state = "off"; > + }; > + > + red_err_led { > + label = "rn2120:red:err"; > + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; > + default-state = "off"; > + }; > + }; > + > + gpio_keys { > + compatible = "gpio-keys"; > + pinctrl-0 = <&power_button_pin &reset_button_pin>; > + pinctrl-names = "default"; > + > + power_button { ditto here and below. > + label = "Power Button"; > + linux,code = <KEY_POWER>; > + gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; > + }; > + > + reset_button { > + label = "Reset Button"; > + linux,code = <KEY_RESTART>; > + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; > + }; > + }; > + > + gpio_poweroff { ditto. Besides the nits, Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> > + compatible = "gpio-poweroff"; > + pinctrl-0 = <&poweroff>; > + pinctrl-names = "default"; > + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; > + }; > +}; >
Hi Sebastian. Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> writes: >> + serial@12000 { >> + clocks = <&coreclk 0>; >> + status = "okay"; >> + }; > > For your possible cleanup later: move clocks = <&coreclk 0> to > armada-370-xp.dtsi and remove this then. > > Also for cleanup later: It would be great if most SoC nodes get > a node label. That way you can just write: > > uart0: { status = "okay" }; > > without replaying node hierarchy over and over again. I will keep that in mind for later cleanups. Regarding the nits, as you took the time to report those, I will send a v3 fixing them tomorrow. Cheers,, a+
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 802720e..c6dd4de 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -112,6 +112,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-xp-axpwifiap.dtb \ armada-xp-db.dtb \ armada-xp-gp.dtb \ + armada-xp-netgear-rn2120.dtb \ armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_ARCH_MXC) += \ imx25-karo-tx25.dtb \ diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts new file mode 100644 index 0000000..ba1e0de --- /dev/null +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -0,0 +1,288 @@ +/* + * Device Tree file for NETGEAR ReadyNAS 2120 + * + * Copyright (C) 2013, 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. + */ + +/dts-v1/; + +#include "armada-xp-mv78230.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "NETGEAR ReadyNAS 2120"; + compatible = "netgear,readynas-2120", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp"; + + chosen { + bootargs = "console=ttyS0,115200 earlyprintk"; + }; + + memory { + device_type = "memory"; + reg = <0 0x00000000 0 0x80000000>; /* 2GB */ + }; + + soc { + ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000 + MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>; + + pcie-controller { + status = "okay"; + + /* Connected to first Marvell 88SE9170 SATA controller */ + pcie@1,0 { + /* Port 0, Lane 0 */ + status = "okay"; + }; + + /* Connected to second Marvell 88SE9170 SATA controller */ + pcie@2,0 { + /* Port 0, Lane 1 */ + status = "okay"; + }; + + /* Connected to Fresco Logic FL1009 USB 3.0 controller */ + pcie@5,0 { + /* Port 1, Lane 0 */ + status = "okay"; + }; + }; + + internal-regs { + pinctrl { + poweroff: poweroff { + marvell,pins = "mpp42"; + marvell,function = "gpio"; + }; + + power_button_pin: power-button-pin { + marvell,pins = "mpp27"; + marvell,function = "gpio"; + }; + + reset_button_pin: reset-button-pin { + marvell,pins = "mpp41"; + marvell,function = "gpio"; + }; + + sata1_led_pin: sata1-led-pin { + marvell,pins = "mpp31"; + marvell,function = "gpio"; + }; + + sata2_led_pin: sata2-led-pin { + marvell,pins = "mpp40"; + marvell,function = "gpio"; + }; + + sata3_led_pin: sata3-led-pin { + marvell,pins = "mpp44"; + marvell,function = "gpio"; + }; + + sata4_led_pin: sata4-led-pin { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; + + sata1_power_pin: sata1-power-pin { + marvell,pins = "mpp24"; + marvell,function = "gpio"; + }; + + sata2_power_pin: sata2-power-pin { + marvell,pins = "mpp25"; + marvell,function = "gpio"; + }; + + sata3_power_pin: sata3-power-pin { + marvell,pins = "mpp26"; + marvell,function = "gpio"; + }; + + sata4_power_pin: sata4-power-pin { + marvell,pins = "mpp28"; + marvell,function = "gpio"; + }; + + sata1_pres_pin: sata1-pres-pin { + marvell,pins = "mpp32"; + marvell,function = "gpio"; + }; + + sata2_pres_pin: sata2-pres-pin { + marvell,pins = "mpp33"; + marvell,function = "gpio"; + }; + + sata3_pres_pin: sata3-pres-pin { + marvell,pins = "mpp34"; + marvell,function = "gpio"; + }; + + sata4_pres_pin: sata4-pres-pin { + marvell,pins = "mpp35"; + marvell,function = "gpio"; + }; + + err_led_pin: err-led-pin { + marvell,pins = "mpp45"; + marvell,function = "gpio"; + }; + }; + + serial@12000 { + clocks = <&coreclk 0>; + status = "okay"; + }; + + mdio { + phy0: ethernet-phy@0 { + compatible = "marvell,88e1318s"; + reg = <0>; + }; + + phy1: ethernet-phy@1 { + compatible = "marvell,88e1318s"; + reg = <1>; + }; + }; + + ethernet@70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + + ethernet@74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; + + /* Front USB 2.0 port */ + usb@50000 { + status = "okay"; + }; + + i2c@11000 { + compatible = "marvell,mv78230-i2c"; + clock-frequency = <400000>; + status = "okay"; + + /* Controller for rear fan #1 of 3 (Protechnic + * MGT4012XB-O20, 8000RPM) near eSATA port */ + g762_fan1: g762@3e { + compatible = "gmt,g762"; + reg = <0x3e>; + clocks = <&g762_clk>; /* input clock */ + fan_gear_mode = <0>; + fan_startv = <1>; + pwm_polarity = <0>; + }; + + /* Controller for rear (center) fan #2 of 3 */ + g762_fan2: g762@48 { + compatible = "gmt,g762"; + reg = <0x48>; + clocks = <&g762_clk>; /* input clock */ + fan_gear_mode = <0>; + fan_startv = <1>; + pwm_polarity = <0>; + }; + + /* Controller for rear fan #3 of 3 */ + g762_fan3: g762@49 { + compatible = "gmt,g762"; + reg = <0x49>; + clocks = <&g762_clk>; /* input clock */ + fan_gear_mode = <0>; + fan_startv = <1>; + pwm_polarity = <0>; + }; + + /* Temperature sensor */ + g751: g751@4c { + compatible = "gmt,g751"; + reg = <0x4c>; + }; + }; + }; + }; + + clocks { + g762_clk: g762_oscillator { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + }; + + gpio_leds { + compatible = "gpio-leds"; + pinctrl-0 = <&sata1_led_pin &sata2_led_pin &err_led_pin + &sata3_led_pin &sata4_led_pin>; + pinctrl-names = "default"; + + red_sata1_led { + label = "rn2120:red:sata1"; + gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + + red_sata2_led { + label = "rn2120:red:sata2"; + gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + + red_sata3_led { + label = "rn2120:red:sata3"; + gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + + red_sata4_led { + label = "rn2120:red:sata4"; + gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + + red_err_led { + label = "rn2120:red:err"; + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; + default-state = "off"; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + pinctrl-0 = <&power_button_pin &reset_button_pin>; + pinctrl-names = "default"; + + power_button { + label = "Power Button"; + linux,code = <KEY_POWER>; + gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; + }; + + reset_button { + label = "Reset Button"; + linux,code = <KEY_RESTART>; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + }; + }; + + gpio_poweroff { + compatible = "gpio-poweroff"; + pinctrl-0 = <&poweroff>; + pinctrl-names = "default"; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; +};
All hardware parts of the (mv78230 Armada XP based) NETGEAR ReadyNAS 2120 are supported by mainline kernel (USB 3.0 and eSATA rear ports, USB 2.0 front port, Gigabit controller and PHYs for the two rear ports, serial port, LEDs, Buttons, 88SE9170 SATA controllers, three G762 fan controllers, G751 temperature sensor) except for: - the Intersil ISL12057 I2C RTC Chip, - the Armada NAND controller. Support for both of those is currently work in progress and does not prevent boot. Signed-off-by: Arnaud Ebalard <arno@natisbad.org> --- Hi, Initial message: This one is intended for v3.14. This depends on the recent fix I pushed for mv78230 PCIe and also on a small patch Guenter Roeck just accepted to have lm75 driver support GMT G751 Temperature sensor (see https://lkml.org/lkml/2013/11/9/273). Regarding the SATA presence and power pin definitions under pinctrl node if you wonder, I thought it would not harm to have them for reference even though they are currently not used. FWIW, I am currently looking if a GPIO regulator can make any use of those. Changes since v1: After Andrew's comment: - Added comment about G751 function After Sebastian's comments: - Changed clock frequency for a clock provider for serial line - Added compatible string for PHY (marvell,mv88e1318s) - Removed useless properties in clocks and gpio_keys nodes - Made G762 clock node name unique by including g762 in it - Changed values for macros for GPIO voltage level - Removed comments after GPIOs - Changed buttons and button pins names After Jason's comment: - Changed values for macros for input keys, removed comments After more documenation reading: - changed i2c compatible string to marvell,mv78230-i2c Comments welcome, Cheers, a+ arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 288 +++++++++++++++++++++++++ 2 files changed, 289 insertions(+) create mode 100644 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts