From patchwork Tue Nov 12 19:46:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3174881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8AE97C045B for ; Tue, 12 Nov 2013 19:48:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BA56205E7 for ; Tue, 12 Nov 2013 19:48:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 639C320115 for ; Tue, 12 Nov 2013 19:48:08 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgJwR-0005G5-CN; Tue, 12 Nov 2013 19:48:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgJwP-0000lz-0b; Tue, 12 Nov 2013 19:48:01 +0000 Received: from mic92-1-81-57-185-249.fbx.proxad.net ([81.57.185.249] helo=smtp.natisbad.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgJwM-0000l8-3J for linux-arm-kernel@lists.infradead.org; Tue, 12 Nov 2013 19:47:59 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id 0A3862C08D7; Tue, 12 Nov 2013 20:47:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1384285654; bh=mWHvvk5Llem0zDR/GmhoJOcFRnTue9iYrcghOuPIvoE=; h=From:To:Cc:Subject:Date; b=EZFe0m9+jxuZDdjKDd1WUg6cSLE/BJ1jdWkGM/81LANmjrTcV0jGyH52vwFPLvZgR STHktoR/pxIZ/gOExkK21/TqCuj8xKr0RX3pJr9fuNE2mU0G7F6wajKtbDJZFXqfgq Q7cp7/b4vOFy/gSRRSiY7vQ36854+UaHjUTyqhBw= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from small (localhost [127.0.0.1]) by smtp.natisbad.org (Postfix) with ESMTP id AFDB22C05C9; Tue, 12 Nov 2013 20:46:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1384285608; bh=mWHvvk5Llem0zDR/GmhoJOcFRnTue9iYrcghOuPIvoE=; h=From:To:Cc:Subject:Date; b=Z9/7w7MuoXUkFAB7ECIp0ZHcxD10ig+n569PTsu14zDdC16Eq4renkuDJcslOSZDG k0iAFtW1uflTLdhMCLn4f36aXlwT9fLwzNFoXOJT3mLfYmCgKODVaDPtF+OJyRctgj ESZ6ow1Tz4GyDJ4Z9y3g1iKy4TGcLyXz9eyGe6gw= X-Hashcash: 1:20:131112:jason@lakedaemon.net::cg8yqLKMBcHgvppi:000000000000000000000000000000000000000004UjI X-Hashcash: 1:20:131112:andrew@lunn.ch::b4i79rBp6+Lx6B2P:00017Hn X-Hashcash: 1:20:131112:gregory.clement@free-electrons.com::mRI1eo8wMdvVLu84:00000000000000000000000000019k6 X-Hashcash: 1:20:131112:sebastian.hesselbarth@gmail.com::2QM/ed4Zww3/isnp:0000000000000000000000000000001A8/ X-Hashcash: 1:20:131112:ezequiel.garcia@free-electrons.com::ipum4TEGVa6TBNAg:0000000000000000000000000000/4C X-Hashcash: 1:20:131112:thomas.petazzoni@free-electrons.com::1LRGWU8sKMYlZMVD:000000000000000000000000005AfA X-Hashcash: 1:20:131112:linux@arm.linux.org.uk::uTAYR1OU7jxzs6A/:0000000000000000000000000000000000000002/+F X-Hashcash: 1:20:131112:linux-arm-kernel@lists.infradead.org::2p4ZpQXrucq0Ug/3:00000000000000000000000003nSt X-Hashcash: 1:20:131112:rob.herring@calxeda.com::v2YvEaBA6nVKdhQU:00000000000000000000000000000000000000D0Vy X-Hashcash: 1:20:131112:pawel.moll@arm.com::oD0xBqdVSWfibNaG:000000000000000000000000000000000000000000054sz X-Hashcash: 1:20:131112:mark.rutland@arm.com::Owv56gKhOLK5WfrO:000000000000000000000000000000000000000004Xwo X-Hashcash: 1:20:131112:swarren@wwwdotorg.org::jYa9badq4jaC8fxd:00000000000000000000000000000000000000000jI+ X-Hashcash: 1:20:131112:ijc+devicetree@hellion.org.uk::ZGO5GYDlSHr9G5xY:000000000000000000000000000000002lnV X-Hashcash: 1:20:131112:devicetree@vger.kernel.org::GCinAUYX68b9atyn:0000000000000000000000000000000000039yy X-Hashcash: 1:20:131112:linux@roeck-us.net::mH2xl/pc3zAnfquq:00000000000000000000000000000000000000000002JG7 From: arno@natisbad.org (Arnaud Ebalard) To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ezequiel Garcia , Thomas Petazzoni Subject: [PATCHv2] ARM: mvebu: Add Netgear ReadyNAS 2120 board X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: D3A5 B68A 839B 38A5 815A 781B B77C 0748 A7AE 341B Date: Tue, 12 Nov 2013 20:46:48 +0100 Message-ID: <87ppq5flnb.fsf@natisbad.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131112_144758_475859_89A905FE X-CRM114-Status: GOOD ( 18.90 ) X-Spam-Score: -1.0 (-) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , Guenter Roeck , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Acked-by: Sebastian Hesselbarth Signed-off-by: Arnaud Ebalard --- 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. Note changed since v2 (i.e. kept for later cleanup session): - move clocks = <&coreclk 0> in serial node to armada-370-xp.dtsi - add a label to most SoC nodes to avoid replaying the whole node hierarchy - see if g762 dt binding can be fixed (no remarks done during review) Changes since v2: After Sebastian's comments: - fixed order of includes (global before local) - fixed *all* node names to use '-' instead of '_' - Added Sebastian's Acked-by 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 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..7ea9fea --- /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 + * + * 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 +#include +#include "armada-xp-mv78230.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 */ + }; + + soc { + ranges = ; + + 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 = ; + gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; + }; + + reset-button { + label = "Reset Button"; + linux,code = ; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; + }; + }; + + gpio-poweroff { + compatible = "gpio-poweroff"; + pinctrl-0 = <&poweroff>; + pinctrl-names = "default"; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + }; +};