From patchwork Fri Nov 22 20:05:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3224111 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 68AE79F26C for ; Fri, 22 Nov 2013 20:06:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A663B20558 for ; Fri, 22 Nov 2013 20:06:48 +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 24D5F2076C for ; Fri, 22 Nov 2013 20:06:47 +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 1Vjwzx-0005tq-1j; Fri, 22 Nov 2013 20:06:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vjwzu-0001B5-HD; Fri, 22 Nov 2013 20:06:38 +0000 Received: from [2a01:e35:139b:9f90:221:70ff:fe55:8f78] (helo=smtp.natisbad.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vjwzr-0001Ab-8j for linux-arm-kernel@lists.infradead.org; Fri, 22 Nov 2013 20:06:36 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id ED0FE2C0D62; Fri, 22 Nov 2013 21:06:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385150772; bh=Tt28HVWwjiPWVSqTuiqRAp9RXUaAYj/6T7aeAhELSno=; h=From:To:Cc:Subject:In-Reply-To:References:References:Date; b=VG/GCw/nkB525/Qv4V2vNZtpjlfg/wdkdujz6/1zvR8U3V8p6ta1ym86hCE0d+fQm Hk3XEV4sNPZlz3IkjZLGhPjAuBi0zSfz35kKK4VN5Z770y8FZbqdPhTHlggMKBftbt ALlABdOZvlghXxht8dKSu/KfGYuUmFDHRn5rzrN8= 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 ACA432C08AD; Fri, 22 Nov 2013 21:05:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385150750; bh=Tt28HVWwjiPWVSqTuiqRAp9RXUaAYj/6T7aeAhELSno=; h=From:To:Cc:Subject:In-Reply-To:References:References:Date; b=mDcuTJo0FKwNlNnyp6Jwvsrmec1hAvSwhdjyV/Xg/Kt6T5xKRhz+7GDYph6TRiuvR CjIMzNTNIAvpD4ENDupbsxb9OToZCyyEdIF1QQwbigAZ01NqhEVljUFpBshsldmt46 luIHztZZq65zaY/+XsYBDCL9REAooMd3ZTHBpU1E= X-Hashcash: 1:20:131122:jason@lakedaemon.net::EHvfCz5OAiT0L8Hm:000000000000000000000000000000000000000001Xpo X-Hashcash: 1:20:131122:andrew@lunn.ch::k9bkwJ+2v+IM1vxE:0000R4L X-Hashcash: 1:20:131122:gregory.clement@free-electrons.com::wnirYfIy/3Qa3THh:0000000000000000000000000000+ob X-Hashcash: 1:20:131122:sebastian.hesselbarth@gmail.com::FPOio+ya5KEFwmoX:0000000000000000000000000000000jIp X-Hashcash: 1:20:131122:linux@arm.linux.org.uk::KZQkLfq+MAsBC2oM:0000000000000000000000000000000000000002gZ4 X-Hashcash: 1:20:131122:linux-arm-kernel@lists.infradead.org::i8XL1wKTa/gsO3UY:00000000000000000000000000V6r X-Hashcash: 1:20:131122:rob.herring@calxeda.com::WndN+s/PzBnmLHXm:000000000000000000000000000000000000003pRc X-Hashcash: 1:20:131122:pawel.moll@arm.com::22wiL/Z1mTriyvO7:00000000000000000000000000000000000000000002NDL X-Hashcash: 1:20:131122:mark.rutland@arm.com::ihEZGMiyOX4O/Puu:000000000000000000000000000000000000000001F5u X-Hashcash: 1:20:131122:swarren@wwwdotorg.org::PZeevguXGG6AEP6H:00000000000000000000000000000000000000000tXF X-Hashcash: 1:20:131122:ijc+devicetree@hellion.org.uk::De7lYT+Z1qPAafuu:0000000000000000000000000000000069Q/ X-Hashcash: 1:20:131122:devicetree@vger.kernel.org::G0eU1KiezTg9rjpG:000000000000000000000000000000000000JJi From: arno@natisbad.org (Arnaud Ebalard) To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH 1/4] kirkwood: NETGEAR ReadyNAS Duo v2 .dts file cleanup In-Reply-To: References: References: Message-Id: <994c811dc436d1c4ae312a269b4ee438be510f6f.1385148929.git.arno@natisbad.org> 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:05:50 +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_150635_741594_3A366D61 X-CRM114-Status: GOOD ( 14.22 ) X-Spam-Score: -1.2 (-) 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 Duo v2 .dts file. Changes are listed below: - Converted GPIO voltage level from value to macros - Converted all numeric input key values to macros - Made button node names more explicit - Added compatible string for PHY (marvell,mv88e1318s) - Added header for the file to describe content and author - Made G762 clock node name unique by including g762 in it - Fixed all node names and labels to use respectively '-' and '_' - Removed useless clocks and gpio-keys properties Signed-off-by: Arnaud Ebalard --- .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 50 +++++++++++++--------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts index 551bfed..65d0587 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts @@ -1,5 +1,17 @@ +/* + * Device Tree file for NETGEAR ReadyNAS Duo v2 + * + * 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 "kirkwood.dtsi" #include "kirkwood-6282.dtsi" @@ -68,10 +80,7 @@ }; clocks { - #address-cells = <1>; - #size-cells = <0>; - - g762_clk: fixedclk { + g762_clk: g762-oscillator { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <8192>; @@ -117,49 +126,47 @@ power_led { label = "status:blue:power_led"; - gpios = <&gpio0 31 1>; /* GPIO 31 Active Low */ + gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; activity_led { label = "status:blue:activity_led"; - gpios = <&gpio1 6 1>; /* GPIO 38 Active Low */ + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; disk1_led { label = "status:blue:disk1_led"; - gpios = <&gpio0 23 1>; /* GPIO 23 Active Low */ + gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; }; disk2_led { label = "status:blue:disk2_led"; - gpios = <&gpio0 22 1>; /* GPIO 22 Active Low */ + gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; }; backup_led { label = "status:blue:backup_led"; - gpios = <&gpio0 29 1>; /* GPIO 29 Active Low*/ + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; pinctrl-0 = <&pmx_button_power &pmx_button_backup &pmx_button_reset>; pinctrl-names = "default"; - button@1 { + power-button { label = "Power Button"; - linux,code = <116>; /* KEY_POWER */ - gpios = <&gpio1 15 1>; + linux,code = ; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; - button@2 { + reset-button { label = "Reset Button"; - linux,code = <0x198>; /* KEY_RESTART */ - gpios = <&gpio0 13 1>; + linux,code = ; + gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; - button@3 { + backup-button { label = "Backup Button"; - linux,code = <133>; /* KEY_COPY */ - gpios = <&gpio1 13 1>; + linux,code = ; + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; }; }; @@ -224,6 +231,7 @@ ethphy0: ethernet-phy@0 { device_type = "ethernet-phy"; + compatible = "marvell,88e1318s"; reg = <0>; }; };