From patchwork Fri Nov 22 20:07:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3224131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 397C89F26C for ; Fri, 22 Nov 2013 20:08:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1D7B9207B4 for ; Fri, 22 Nov 2013 20:08:12 +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 2C29B2076C for ; Fri, 22 Nov 2013 20:08:07 +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 1Vjx0u-0006Zk-7a; Fri, 22 Nov 2013 20:07:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vjx0k-0001ES-U4; Fri, 22 Nov 2013 20:07:30 +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 1Vjx0h-0001Cp-Fd for linux-arm-kernel@lists.infradead.org; Fri, 22 Nov 2013 20:07:28 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id 37E132C0D63; Fri, 22 Nov 2013 21:07:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385150825; bh=Z1pzkM8KWTdN6mJEUa+6bg+BE59QsUdiQf9wA7WEnwc=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=uY4F4d9wdJ5rxynCV4m2e3WFaxmNLpk5Wvk4Vm9J4YwpzY/PyIwZP/bxjrX7LAQnf B9f9RqUu2H2Kasx9686fCdLOUmMCdGzk8WDfWOTH1urGTw91MsAjNifQki6qTHr0+s NICrcef9nZ1W96oKWtzRNR1stOaKUUzibHA54vYw= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from small (localhost [127.0.0.1]) by smtp.natisbad.org (Postfix) with ESMTP id 11FFD2C0D61; Fri, 22 Nov 2013 21:07:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385150821; bh=Z1pzkM8KWTdN6mJEUa+6bg+BE59QsUdiQf9wA7WEnwc=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=efsQGHQP782vom8NHWLtTkXBf8SR0mkwbNedFcEH8D57RKxX8nz4mq2EECUgv3nh5 Xc8lO0XZwy3hcEzAa9Zn3BM+qyDa/Jr2eaCANWmQ6FM2THxVXnVB95SSFwll/38NXy zimN3pRHmTHendrYgoMCyIQOJXw3WiJHs64HFb/Y= X-Hashcash: 1:20:131122:jason@lakedaemon.net::c36iyYoazXUgdEC7:000000000000000000000000000000000000000000woj X-Hashcash: 1:20:131122:andrew@lunn.ch::kTUBtpNAzQKFYR12:000IEp6 X-Hashcash: 1:20:131122:gregory.clement@free-electrons.com::MrxaL5IGutT6dvMt:0000000000000000000000000000DWC X-Hashcash: 1:20:131122:sebastian.hesselbarth@gmail.com::EjfFB6EFvflubqRV:0000000000000000000000000000000h0P X-Hashcash: 1:20:131122:linux@arm.linux.org.uk::PQoK1Tn0cOgF5j36:000000000000000000000000000000000000000170p X-Hashcash: 1:20:131122:linux-arm-kernel@lists.infradead.org::PSqJEKTPMLaX0uCi:00000000000000000000000008Ld6 X-Hashcash: 1:20:131122:rob.herring@calxeda.com::6TdLwAEvspLu2Coz:000000000000000000000000000000000000002HZS X-Hashcash: 1:20:131122:pawel.moll@arm.com::oTmhLwJJjgBZu82C:00000000000000000000000000000000000000000009SWg X-Hashcash: 1:20:131122:mark.rutland@arm.com::0FvmnD6ynCpFXpzp:000000000000000000000000000000000000000009Fy1 X-Hashcash: 1:20:131122:swarren@wwwdotorg.org::q18tJG4grIlYVVXQ:0000000000000000000000000000000000000000DCPS X-Hashcash: 1:20:131122:ijc+devicetree@hellion.org.uk::znbDkduRPcnqDKHL:000000000000000000000000000000001oxr X-Hashcash: 1:20:131122:devicetree@vger.kernel.org::wFUP39a2CTdbn3pd:000000000000000000000000000000000009Z89 From: arno@natisbad.org (Arnaud Ebalard) To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH 3/4] ARM: mvebu: NETGEAR ReadyNAS 104 .dts file cleanup In-Reply-To: References: Message-Id: X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: D3A5 B68A 839B 38A5 815A 781B B77C 0748 A7AE 341B Date: Fri, 22 Nov 2013 21:07:01 +0100 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-20131122_150727_821197_FF3C2FAB X-CRM114-Status: GOOD ( 12.05 ) X-Spam-Score: -1.0 (-) Cc: Mark Rutland , devicetree@vger.kernel.org, Russell King , Pawel Moll , Stephen Warren , Ian Campbell , Rob Herring , 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 The patch does some cleanup work on NETGEAR ReadyNAS 104 .dts file. Changes are listed below: - Completed conversion from value to macros for GPIO voltage level - Converted all numeric input key values to macros - Fixed all node names and labels to use respectively '-' and '_' - Made button names more explicit - Changed order of included files from general to local - Removed useless clocks and gpio-keys properties - Added compatible string for PHY (marvell,mv88e1318s) - Made G762 clock node name unique by including g762 in it Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-370-netgear-rn104.dts | 66 +++++++++++++------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts index 50b5150..853ddf7 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts @@ -11,8 +11,9 @@ /dts-v1/; -#include "armada-370.dtsi" +#include #include +#include "armada-370.dtsi" / { model = "NETGEAR ReadyNAS 104"; @@ -59,12 +60,12 @@ marvell,function = "gpio"; }; - backup_key_pin: backup-key-pin { + backup_button_pin: backup-button-pin { marvell,pins = "mpp52"; marvell,function = "gpio"; }; - power_key_pin: power-key-pin { + power_button_pin: power-button-pin { marvell,pins = "mpp62"; marvell,function = "gpio"; }; @@ -79,7 +80,7 @@ marvell,function = "gpio"; }; - reset_key_pin: reset-key-pin { + reset_button_pin: reset-button-pin { marvell,pins = "mpp65"; marvell,function = "gpio"; }; @@ -87,10 +88,12 @@ mdio { phy0: ethernet-phy@0 { + compatible = "marvell,88e1318s"; reg = <0>; }; phy1: ethernet-phy@1 { + compatible = "marvell,88e1318s"; reg = <1>; }; }; @@ -136,90 +139,85 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - - g762_clk: fixedclk { + g762_clk: g762-oscillator { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <8192>; }; }; - gpio_leds { + gpio-leds { compatible = "gpio-leds"; pinctrl-0 = <&backup_led_pin &power_led_pin>; pinctrl-names = "default"; - blue_backup_led { + blue-backup-led { label = "rn104:blue:backup"; - gpios = <&gpio1 31 0>; /* GPIO 63 Active High */ + gpios = <&gpio1 31 GPIO_ACTIVE_HIGH>; default-state = "off"; }; - blue_power_led { + blue-power-led { label = "rn104:blue:pwr"; - gpios = <&gpio2 0 1>; /* GPIO 64 Active Low */ + gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; linux,default-trigger = "keep"; }; - sata1_led { + blue-sata1-led { label = "rn104:blue:sata1"; gpios = <&pca9554 0 GPIO_ACTIVE_LOW>; default-state = "off"; }; - sata2_led { + blue-sata2-led { label = "rn104:blue:sata2"; gpios = <&pca9554 1 GPIO_ACTIVE_LOW>; default-state = "off"; }; - sata3_led { + blue-sata3-led { label = "rn104:blue:sata3"; gpios = <&pca9554 2 GPIO_ACTIVE_LOW>; default-state = "off"; }; - sata4_led { + blue-sata4-led { label = "rn104:blue:sata4"; gpios = <&pca9554 3 GPIO_ACTIVE_LOW>; default-state = "off"; }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&backup_key_pin - &power_key_pin - &reset_key_pin>; + pinctrl-0 = <&backup_button_pin + &power_button_pin + &reset_button_pin>; pinctrl-names = "default"; - button@1 { + backup-button { label = "Backup Button"; - linux,code = <133>; /* KEY_COPY */ - gpios = <&gpio1 20 1>; + linux,code = ; + gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; }; - button@2 { + power-button { label = "Power Button"; - linux,code = <116>; /* KEY_POWER */ - gpios = <&gpio1 30 0>; + linux,code = ; + gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; }; - button@3 { + reset-button { label = "Reset Button"; - linux,code = <0x198>; /* KEY_RESTART */ - gpios = <&gpio2 1 1>; + linux,code = ; + gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; }; }; - gpio_poweroff { + gpio-poweroff { compatible = "gpio-poweroff"; pinctrl-0 = <&poweroff>; pinctrl-names = "default"; - gpios = <&gpio1 28 1>; + gpios = <&gpio1 28 GPIO_ACTIVE_LOW>; }; };