From patchwork Fri Nov 22 20:07:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3224141 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 00DDAC045B for ; Fri, 22 Nov 2013 20:08:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1F198207B5 for ; Fri, 22 Nov 2013 20:08:55 +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 C25D4207B6 for ; Fri, 22 Nov 2013 20:08: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 1Vjx1l-0007Bl-Tl; Fri, 22 Nov 2013 20:08:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vjx1W-0001GW-KR; Fri, 22 Nov 2013 20:08:18 +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 1Vjx1S-0001FV-H1 for linux-arm-kernel@lists.infradead.org; Fri, 22 Nov 2013 20:08:15 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id B08E92C0D61; Fri, 22 Nov 2013 21:07:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385150870; bh=6aDvqE1uWIma2csDEsvfY3+TkeCpNrPKqdAZLYjRlo4=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=dOvLvE18LZeVgoYvTHbB0NwjmrRysV5Sd6B9NNKLZ81426UVEkUWpMfOIaVTN6TFH QROdC6VOGaBSk/WKZ7zGncY1qoFeEYnovJKJ6l6hIxXddAWAtAXahALriL32vmCNbr tcF+/RHKhSDkudsw5qL3xdaCHbbvykbAoVbObX70= 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 B992C2C08AD; Fri, 22 Nov 2013 21:07:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1385150859; bh=6aDvqE1uWIma2csDEsvfY3+TkeCpNrPKqdAZLYjRlo4=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=uhPTWgJbf4rUDpSjHyNqyvrJSNkHalTV2BwUUpf/CG3BPjroYr8lopetX3JO2recK VAxgp/Xrt7c4M7auioYnfbYLj85soagzGOQxnPqUCBVpLrdNicOFgNqoqwuYK2+oy4 BEYTyWtCtP6Hubd6eK6MMhpratXs67Ym5P2z9Upo= X-Hashcash: 1:20:131122:jason@lakedaemon.net::v0uRlwV/fSdtunWf:000000000000000000000000000000000000000006BL6 X-Hashcash: 1:20:131122:andrew@lunn.ch::yKMN7/C8jpwkRS5k:000Ex1r X-Hashcash: 1:20:131122:gregory.clement@free-electrons.com::URXG8B3m65JJxO/z:0000000000000000000000000000p95 X-Hashcash: 1:20:131122:sebastian.hesselbarth@gmail.com::PNHGEWkJIWTQKdaJ:000000000000000000000000000000ByhU X-Hashcash: 1:20:131122:linux@arm.linux.org.uk::9mOZM7T0SDcU/SCQ:0000000000000000000000000000000000000004o5V X-Hashcash: 1:20:131122:linux-arm-kernel@lists.infradead.org::sHacFUGjso4Qvafv:00000000000000000000000002edh X-Hashcash: 1:20:131122:rob.herring@calxeda.com::9MbsrKvJen/FW+xG:000000000000000000000000000000000000001wVS X-Hashcash: 1:20:131122:pawel.moll@arm.com::fFZB/GH3TweCu9ws:00000000000000000000000000000000000000000004C+p X-Hashcash: 1:20:131122:mark.rutland@arm.com::Px2qEQxTmOWkNM0j:000000000000000000000000000000000000000001jwo X-Hashcash: 1:20:131122:swarren@wwwdotorg.org::IdDYb+PX+CodGLjH:00000000000000000000000000000000000000002LTo X-Hashcash: 1:20:131122:ijc+devicetree@hellion.org.uk::4/yrL2uPRQMnbU5S:000000000000000000000000000000000+Vj X-Hashcash: 1:20:131122:devicetree@vger.kernel.org::mBFKllUAI3qOsr2t:000000000000000000000000000000000002Z9S From: arno@natisbad.org (Arnaud Ebalard) To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH 4/4] ARM: NETGEAR ReadyNAS Duo v2 and RN102 .dts file whitespace cleanup In-Reply-To: References: Message-Id: <9211978b60a76b321db0a5a934d9cb9f959519d9.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:07:39 +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_150814_954980_92FFBD22 X-CRM114-Status: GOOD ( 10.62 ) 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 This patch provides some whitespace cleanup for NETGEAR ReadyNAS Duo v2 and 102 .dts files: - Fixed bad whitespaces - Added spaces 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 87cd003..1cbd338 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 65d0587..0961e80 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 {