From patchwork Fri Nov 29 20:27:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3259481 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 126FC9F384 for ; Fri, 29 Nov 2013 20:30:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 244C3200E1 for ; Fri, 29 Nov 2013 20:30:54 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 307E5200CF for ; Fri, 29 Nov 2013 20:30:53 +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 1VmUhC-0003ae-3h; Fri, 29 Nov 2013 20:29:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VmUgs-0001wC-F8; Fri, 29 Nov 2013 20:29: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 1VmUgp-0001vS-8z for linux-arm-kernel@lists.infradead.org; Fri, 29 Nov 2013 20:29:27 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id BCDBA2C0D6E; Fri, 29 Nov 2013 21:29:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385756945; bh=6O+Y5e1k79k4Mrk/QF4IAKgTJHZ5f9l+5ZZC02ar6SU=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=oRKVTx4IFn0cm7kmWBmTUB48zWRNnJxSi9Nu93JGIWNyoEr6X/JgptrYsHoDD+Nfj m5jS3ze5cj6GTXZMODj/RVjYz86fuN3cp/l24bSwSOj0ro3T3sTMAjE90l51FLKnaP qoMLDibZqDhB6SQQw2ESwAcNYPZ4xXSrdoubdoYw= 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 DBAAC2C00B1; Fri, 29 Nov 2013 21:27:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385756878; bh=6O+Y5e1k79k4Mrk/QF4IAKgTJHZ5f9l+5ZZC02ar6SU=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=VIDc0DNYC8zZzDjmo6em1k/O0Z/ks82bt062e7hR6DSmMAhmfehtxYegsNlpA+EZf gXzXpFewrT0Q6T3Hs1wXyEY7/ZzA32PQv7wmbag9ajg2SizbMSW7bSooP1A2rBIkqL ElHzQTYonMtduJnmJC/y1cxyARy5lVHwVkbd7Y08= X-Hashcash: 1:20:131129:jason@lakedaemon.net::zNBRB4sR92MI7SNx:000000000000000000000000000000000000000000Kix X-Hashcash: 1:20:131129:andrew@lunn.ch::a+Qm3EWzIoyQEqb2:00029UT X-Hashcash: 1:20:131129:gregory.clement@free-electrons.com::wKPGaEeCvMhEHQsO:0000000000000000000000000002U2M X-Hashcash: 1:20:131129:sebastian.hesselbarth@gmail.com::PN+UqQHzzdxytAPC:000000000000000000000000000000CcyA X-Hashcash: 1:20:131129:linux@arm.linux.org.uk::YCZvgl9KwxjNvJ1w:0000000000000000000000000000000000000002Knb X-Hashcash: 1:20:131129:linux-arm-kernel@lists.infradead.org::1u+SrctZbuEyMxMM:00000000000000000000000000E8f X-Hashcash: 1:20:131129:rob.herring@calxeda.com::svrO7ALNu3knyJPJ:000000000000000000000000000000000000002k29 X-Hashcash: 1:20:131129:pawel.moll@arm.com::uqyfj1reBN8W7NFl:00000000000000000000000000000000000000000001Otd X-Hashcash: 1:20:131129:mark.rutland@arm.com::pouAnUT6ZTXQNXUh:000000000000000000000000000000000000000000dG7 X-Hashcash: 1:20:131129:swarren@wwwdotorg.org::xLTq5iIKk3ws8wTN:000000000000000000000000000000000000000052Ug X-Hashcash: 1:20:131129:ijc+devicetree@hellion.org.uk::ND462JJ84M277Mtb:0000000000000000000000000000000067co X-Hashcash: 1:20:131129:devicetree@vger.kernel.org::oNYp1Pn5rCP4UJAH:000000000000000000000000000000000002LFt From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCHv2 4/4] ARM: Fix whitespaces in NETGEAR ReadyNAS .dts files In-Reply-To: References: Message-Id: Date: Fri, 29 Nov 2013 21:27:58 +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-20131129_152927_599167_F54823D3 X-CRM114-Status: GOOD ( 10.76 ) 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 This patch provides some whitespace cleanup for NETGEAR ReadyNAS Duo v2 and 102 .dts files: - Fixed bad spaces - Added some space between nodes to improve readability Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 1 + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 48 ++++++++++++++-------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts index 6411105..29541a4 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts @@ -64,6 +64,7 @@ marvell,pins = "mpp57"; marvell,function = "gpio"; }; + sata1_led_pin: sata1-led-pin { marvell,pins = "mpp15"; marvell,function = "gpio"; 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 03bb136..ea9a039 100644 --- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts @@ -45,34 +45,42 @@ marvell,pins = "mpp47"; marvell,function = "gpio"; }; + pmx_button_backup: pmx-button-backup { marvell,pins = "mpp45"; marvell,function = "gpio"; }; + pmx_button_reset: pmx-button-reset { marvell,pins = "mpp13"; marvell,function = "gpio"; }; + pmx_led_blue_power: pmx-led-blue-power { marvell,pins = "mpp31"; marvell,function = "gpio"; }; + pmx_led_blue_activity: pmx-led-blue-activity { marvell,pins = "mpp38"; marvell,function = "gpio"; }; + pmx_led_blue_disk1: pmx-led-blue-disk1 { marvell,pins = "mpp23"; marvell,function = "gpio"; }; + pmx_led_blue_disk2: pmx-led-blue-disk2 { marvell,pins = "mpp22"; marvell,function = "gpio"; }; + pmx_led_blue_backup: pmx-led-blue-backup { marvell,pins = "mpp29"; marvell,function = "gpio"; }; + pmx_poweroff: pmx-poweroff { marvell,pins = "mpp30"; marvell,function = "gpio"; @@ -129,18 +137,22 @@ gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; + activity_led { label = "status:blue:activity_led"; gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; + disk1_led { label = "status:blue:disk1_led"; gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; }; + disk2_led { label = "status:blue:disk2_led"; gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; }; + backup_led { label = "status:blue:backup_led"; gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; @@ -158,11 +170,13 @@ linux,code = ; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; + reset-button { label = "Reset Button"; linux,code = ; gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; + backup-button { label = "Backup Button"; linux,code = ; @@ -177,23 +191,23 @@ gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - usb_power: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB 3.0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio1 14 0>; - }; - }; + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + usb3_regulator: usb3-regulator { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "USB 3.0 Power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio1 14 GPIO_ACTIVE_HIGH>; + }; + }; }; &nand {