From patchwork Sat Sep 20 18:06:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 4942221 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 17C38BEEA5 for ; Sat, 20 Sep 2014 18:09:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CFB5B201F5 for ; Sat, 20 Sep 2014 18:09:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 BE382201BB for ; Sat, 20 Sep 2014 18:09:04 +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 1XVP4B-0001Eh-OI; Sat, 20 Sep 2014 18:07:27 +0000 Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XVP3l-00010w-4J for linux-arm-kernel@lists.infradead.org; Sat, 20 Sep 2014 18:07:03 +0000 Received: by mail-wi0-f172.google.com with SMTP id em10so993298wid.5 for ; Sat, 20 Sep 2014 11:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wq+YmovTr5eE3hJP3DwUkqngFYIZqspPdGSxITT1g2M=; b=HmnkInzVgiQXmKFumvIq/Lnc+kPflceDK8XeDZUTL4Q9/J935wL2/KncKe9BMlpWEN LRaV6OW64HJcBQVSxMf2gUl8cfHjAWetu5z7iFYmZTaAdUJYrL3mZeVJpP4hobyNb6EP AEImjJlf9gCZVd6P5NR/qEE3MtRnh76/S2SoB1zjUj/4XOvZsnyD6oIdzGRALc6OjCgz a7TGYzUplnqZQ70D/7wTOhbX9HYFju0aKrq0nG6ec1n4j2IPbud6hhHFv950HXd/Esjv ud7D+F1NDK3UWeenNdziyuhFMqX0+rm3XT3Ao93DFfQmEvyn1nen2/8x8hNdQYs8G8Y1 s1tg== X-Received: by 10.194.220.7 with SMTP id ps7mr9278394wjc.28.1411236398853; Sat, 20 Sep 2014 11:06:38 -0700 (PDT) Received: from topkick.lan (g226144207.adsl.alicedsl.de. [92.226.144.207]) by mx.google.com with ESMTPSA id ec2sm6104824wib.19.2014.09.20.11.06.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Sep 2014 11:06:37 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH 4/5] ARM: mvebu: armada-xp: Use PCIe node aliases Date: Sat, 20 Sep 2014 20:06:30 +0200 Message-Id: <1411236391-422-5-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1411236391-422-1-git-send-email-sebastian.hesselbarth@gmail.com> References: <1411236391-422-1-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140920_110701_530934_4E947A45 X-CRM114-Status: GOOD ( 10.89 ) X-Spam-Score: -0.1 (/) Cc: Mark Rutland , Andrew Lunn , Jason Cooper , Pawel Moll , Ian Campbell , linux-kernel@vger.kernel.org, Gregory Clement , devicetree@vger.kernel.org, Rob Herring , Kumar Gala , Bjorn Helgaas , Thomas Petazzoni , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Armada XP pcie controller and port nodes gained aliases, make use of them. Signed-off-by: Sebastian Hesselbarth --- Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala Cc: Bjorn Helgaas Cc: Jason Cooper Cc: Andrew Lunn Cc: Gregory Clement Cc: Thomas Petazzoni Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/armada-xp-axpwifiap.dts | 30 +++++++---------- arch/arm/boot/dts/armada-xp-db.dts | 42 +++++++++--------------- arch/arm/boot/dts/armada-xp-gp.dts | 27 +++++---------- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 24 ++++++-------- arch/arm/boot/dts/armada-xp-matrix.dts | 12 +++---- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 30 +++++++---------- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 13 +++----- 7 files changed, 65 insertions(+), 113 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index 1b2dd3a4000b..88c63ec6f355 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -37,25 +37,6 @@ ranges = ; - pcie: pcie-controller { - status = "okay"; - - /* First mini-PCIe port */ - pcie00: pcie@0,0 { - status = "okay"; - }; - - /* Second mini-PCIe port */ - pcie01: pcie@0,1 { - status = "okay"; - }; - - /* Renesas uPD720202 USB 3.0 controller */ - pcie03: pcie@0,3 { - status = "okay"; - }; - }; - internal-regs { serial@12000 { status = "okay"; @@ -126,6 +107,17 @@ }; }; +&pcie { status = "okay"; }; + +/* First mini-PCIe port */ +&pcie00 { status = "okay"; }; + +/* Second mini-PCIe port */ +&pcie01 { status = "okay"; }; + +/* Renesas uPD720202 USB 3.0 controller */ +&pcie03 { status = "okay"; }; + &pinctrl { pinctrl-0 = <&pmx_phy_int>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index 3cda0f6e5c37..58c2892783a7 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts @@ -71,33 +71,6 @@ }; }; - pcie: pcie-controller { - status = "okay"; - - /* - * All 6 slots are physically present as - * standard PCIe slots on the board. - */ - pcie00: pcie@0,0 { - status = "okay"; - }; - pcie01: pcie@0,1 { - status = "okay"; - }; - pcie02: pcie@0,2 { - status = "okay"; - }; - pcie03: pcie@0,3 { - status = "okay"; - }; - pcie20: pcie@2,0 { - status = "okay"; - }; - pcie30: pcie@3,0 { - status = "okay"; - }; - }; - internal-regs { serial@12000 { status = "okay"; @@ -190,3 +163,18 @@ }; }; }; + +/* All 6 slots are physically present as standard PCIe slots on the board. */ +&pcie { status = "okay"; }; + +&pcie00 { status = "okay"; }; + +&pcie01 { status = "okay"; }; + +&pcie02 { status = "okay"; }; + +&pcie03 { status = "okay"; }; + +&pcie20 { status = "okay"; }; + +&pcie30 { status = "okay"; }; diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index 30435e85ff33..ee92bcf0d4bd 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts @@ -81,24 +81,6 @@ }; }; - pcie: pcie-controller { - status = "okay"; - - /* - * The 3 slots are physically present as - * standard PCIe slots on the board. - */ - pcie00: pcie@0,0 { - status = "okay"; - }; - pcie20: pcie@2,0 { - status = "okay"; - }; - pcie30: pcie@3,0 { - status = "okay"; - }; - }; - internal-regs { serial@12000 { status = "okay"; @@ -189,3 +171,12 @@ }; }; }; + +/* The 3 slots are physically present as standard PCIe slots on the board. */ +&pcie { status = "okay"; }; + +&pcie00 { status = "okay"; }; + +&pcie20 { status = "okay"; }; + +&pcie30 { status = "okay"; }; diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts index d7607009ecdc..86be971f8fec 100644 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts @@ -34,20 +34,6 @@ ranges = ; - pcie: pcie-controller { - status = "okay"; - - /* Quad port sata: Marvell 88SX7042 */ - pcie00: pcie@0,0 { - status = "okay"; - }; - - /* USB 3.0 xHCI controller: NEC D720200F1 */ - pcie10: pcie@1,0 { - status = "okay"; - }; - }; - internal-regs { serial@12000 { status = "okay"; @@ -259,6 +245,16 @@ }; }; +&pcie { status = "okay"; }; + +/* Quad port SATA: Marvell 88SX7042 */ +&pcie00 { + status = "okay"; +}; + +/* USB 3.0 xHCI controller: NEC D720200F1 */ +&pcie10 { status = "okay"; }; + &pinctrl { poweroff_pin: poweroff-pin { marvell,pins = "mpp24"; diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts index 77f9f01a9920..97db958bbf02 100644 --- a/arch/arm/boot/dts/armada-xp-matrix.dts +++ b/arch/arm/boot/dts/armada-xp-matrix.dts @@ -63,17 +63,13 @@ }; }; - pcie: pcie-controller { - status = "okay"; - - pcie00: pcie@0,0 { - status = "okay"; - }; - }; - usb@50000 { status = "okay"; }; }; }; }; + +&pcie { status = "okay"; }; + +&pcie00 { status = "okay"; }; diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 98beb572a46c..733e5448298b 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -32,25 +32,6 @@ ranges = ; - pcie: pcie-controller { - status = "okay"; - - /* Connected to first Marvell 88SE9170 SATA controller */ - pcie00: pcie@0,0 { - status = "okay"; - }; - - /* Connected to second Marvell 88SE9170 SATA controller */ - pcie01: pcie@0,1 { - status = "okay"; - }; - - /* Connected to Fresco Logic FL1009 USB 3.0 controller */ - pcie10: pcie@1,0 { - status = "okay"; - }; - }; - internal-regs { serial@12000 { status = "okay"; @@ -240,6 +221,17 @@ }; }; +&pcie { status = "okay"; }; + +/* Connected to first Marvell 88SE9170 SATA controller */ +&pcie00 { status = "okay"; }; + +/* Connected to second Marvell 88SE9170 SATA controller */ +&pcie01 { status = "okay"; }; + +/* Connected to Fresco Logic FL1009 USB 3.0 controller */ +&pcie10 { status = "okay"; }; + &pinctrl { poweroff: poweroff { marvell,pins = "mpp42"; diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index 781818614adc..e0c1331e3236 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -61,14 +61,6 @@ }; }; - pcie: pcie-controller { - status = "okay"; - /* Internal mini-PCIe connector */ - pcie00: pcie@0,0 { - status = "okay"; - }; - }; - internal-regs { serial@12000 { status = "okay"; @@ -182,6 +174,11 @@ }; }; +&pcie { status = "okay"; }; + +/* Internal mini-PCIe connector */ +&pcie00 { status = "okay"; }; + &pinctrl { led_pins: led-pins-0 { marvell,pins = "mpp49", "mpp51", "mpp53";