From patchwork Fri Oct 9 22:10:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 7364351 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F1D9ABEEA4 for ; Fri, 9 Oct 2015 22:15:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B187F207DA for ; Fri, 9 Oct 2015 22:15:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD77520760 for ; Fri, 9 Oct 2015 22:15:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zkfur-0003xk-BT; Fri, 09 Oct 2015 22:13:29 +0000 Received: from 2a02-8428-026f-b200-0221-70ff-fe55-8f78.rev.sfr.net ([2a02:8428:26f:b200:221:70ff:fe55:8f78] helo=smtp.natisbad.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zkfuo-0003KY-4H for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2015 22:13:27 +0000 Received: by smtp.natisbad.org (Postfix, from userid 109) id DBD7A1702813; Sat, 10 Oct 2015 00:11:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1444428664; bh=6l3HRS8tMpZ2ggt9pvou5a028bGsSQ0AOy8dAVujmPw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=u3z4RPGHpzh+J92HxAV9Z7RDJFjhHNObPFmHmyjZjIEskcyugQzgCiOUuxNGOelhM /RTcTw5TMsrIdru8Ru3XF6xOfb3ciq05FQpTX5FuyJ4jKdHOMZzYrGJnYjkEJXGG7O GiXLqeHAdIj+KtYElLl0VzMVu/r+oTjfkXS8iHOU= 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, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from thin (localhost [IPv6:::1]) by smtp.natisbad.org (Postfix) with ESMTP id 8F23D1700C53; Sat, 10 Oct 2015 00:10:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1444428639; bh=6l3HRS8tMpZ2ggt9pvou5a028bGsSQ0AOy8dAVujmPw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=bEdP1z9+FQv1bcEZyjBXeIDHEyNrxeazNtc8JfDxKHbFgEVy2CVrHkwJlG7Ln6BeO 8jvyxxaAkCtkjktNDoiSUF89THeVsQTuZMYXHMWePKcsvxlBEy4AyRYOx2YxV8Df/3 hGS68lIzqgZw892QA6ADvxaCtFgY58N1YOHP6raI= X-Hashcash: 1:20:151009:jason@lakedaemon.net::QVwzDtMgMUS2TRYC:000000000000000000000000000000000000000003B5V X-Hashcash: 1:20:151009:andrew@lunn.ch::VzRrdXMSI4OTAIAS:0001mI6 X-Hashcash: 1:20:151009:gregory.clement@free-electrons.com::bt5mhF03gqxRmNbh:0000000000000000000000000001yGW X-Hashcash: 1:20:151009:sebastian.hesselbarth@gmail.com::Zbfc0x6ZLCoBjfOR:00000000000000000000000000000015uD X-Hashcash: 1:20:151009:robh+dt@kernel.org::cpbpMZcrDQiszpAy:00000000000000000000000000000000000000000003EZs X-Hashcash: 1:20:151009:pawel.moll@arm.com::1H6htU/4LSSLZ1uw:00000000000000000000000000000000000000000000ky1 X-Hashcash: 1:20:151009:mark.rutland@arm.com::asRZhzhmGEcQ3ORK:000000000000000000000000000000000000000005X0W X-Hashcash: 1:20:151009:ijc+devicetree@hellion.org.uk::o2mKQKuW+GCKtOFL:000000000000000000000000000000000mkP X-Hashcash: 1:20:151009:galak@codeaurora.org::OXevyzEKsNzM+CD0:000000000000000000000000000000000000000004R7t X-Hashcash: 1:20:151009:linux@arm.linux.org.uk::qDLdnI/zggtN+vJs:00000000000000000000000000000000000000003nD X-Hashcash: 1:20:151009:linux-arm-kernel@lists.infradead.org::tZwclH6GVv76tmlW:00000000000000000000000001T5E X-Hashcash: 1:20:151009:devicetree@vger.kernel.org::S+LxxQVnLGQb5F4P:000000000000000000000000000000000001zpb X-Hashcash: 1:20:151009:linux-kernel@vger.kernel.org::zxvMYGXPKTIIkzuR:0000000000000000000000000000000000Mi2 X-Hashcash: 1:20:151009:tuxoholic@hotmail.de::Bmcoap9NMPBR10CV:000000000000000000000000000000000000000000FH9 From: Arnaud Ebalard To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/2] arm: mvebu: reorder nodes under internal-regs by address in RN2120 .dts file In-Reply-To: References: Message-Id: <277de75473af2431849a7494ae65b57dbc9a8309.1444428035.git.arno@natisbad.org> Date: Sat, 10 Oct 2015 00:10:39 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151009_151326_528120_EE5123A1 X-CRM114-Status: GOOD ( 13.28 ) X-Spam-Score: -1.0 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, TuxOholic 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 cosmetic patch reorder nodes under internal-regs by increasing address order, as epxected. Signed-off-by: Arnaud Ebalard Acked-by: Andrew Lunn --- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 86 +++++++++++++------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 85b2f87c0b8a..d72a69d97ba2 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -94,54 +94,11 @@ status = "disabled"; }; - /* Two rear eSATA ports */ - sata@a0000 { - nr-ports = <2>; - status = "okay"; - }; - - serial@12000 { - status = "okay"; - }; - - mdio { - phy0: ethernet-phy@0 { /* Marvell 88E1318 */ - reg = <0>; - }; - - phy1: ethernet-phy@1 { /* Marvell 88E1318 */ - 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,mv64xxx-i2c"; clock-frequency = <400000>; status = "okay"; - isl12057: isl12057@68 { - compatible = "isil,isl12057"; - reg = <0x68>; - isil,irq2-can-wakeup-machine; - }; - /* Controller for rear fan #1 of 3 (Protechnic * MGT4012XB-O20, 8000RPM) near eSATA port */ g762_fan1: g762@3e { @@ -178,6 +135,49 @@ compatible = "gmt,g751"; reg = <0x4c>; }; + + isl12057: isl12057@68 { + compatible = "isil,isl12057"; + reg = <0x68>; + isil,irq2-can-wakeup-machine; + }; + }; + + serial@12000 { + status = "okay"; + }; + + /* Front USB 2.0 port */ + usb@50000 { + status = "okay"; + }; + + mdio { + phy0: ethernet-phy@0 { /* Marvell 88E1318 */ + reg = <0>; + }; + + phy1: ethernet-phy@1 { /* Marvell 88E1318 */ + reg = <1>; + }; + }; + + ethernet@70000 { + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + + ethernet@74000 { + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; + + /* Two rear eSATA ports */ + sata@a0000 { + nr-ports = <2>; + status = "okay"; }; nand@d0000 {