From patchwork Sat Sep 20 18:06:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 4942241 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 036FD9F2EC for ; Sat, 20 Sep 2014 18:09:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9296D201F7 for ; Sat, 20 Sep 2014 18:09:15 +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 3EB1B201F5 for ; Sat, 20 Sep 2014 18:09:14 +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 1XVP41-00019E-1M; Sat, 20 Sep 2014 18:07:17 +0000 Received: from mail-wi0-x232.google.com ([2a00:1450:400c:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XVP3k-00010v-Lx for linux-arm-kernel@lists.infradead.org; Sat, 20 Sep 2014 18:07:03 +0000 Received: by mail-wi0-f178.google.com with SMTP id z2so1008566wiv.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=NqWZurRV1QxfZ4L9PFe+3yDtoK1K2Y3Ubdiy+vxIGZM=; b=LxJBk4XKVGEFcBtBDBCqRY2ntNEFYzl+YtT/l7UbEJdD62MArg5bSSr7rfliyKSNj9 HRYWunoi9BSRkNU7msLz2m1SQeDOw04JVT15SIET0V/r2B9KwqqB6jngj3wAu5BM70lg 5NP0HWElnzKDquVjEEAV9qlmtJ4n+WiJobQVLyTSFQQXjG/943Jt9ZUBTuFoMcL8M8D/ XevfNwjVSi92kDRDvvGpznAhKsD6agavykihVgapz3gFOMKzreflW+J7NvxauExuiVK+ hzRrhUYR8VFc00oTpriUNwdhO2wv+HpnQr4sS++g+RKDQnrA/qBWMwcBRNFzBbPVo/va vAEQ== X-Received: by 10.194.219.34 with SMTP id pl2mr8916878wjc.48.1411236398535; 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 di1sm6100666wib.21.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 3/5] ARM: mvebu: armada-xp: Correct misnumbered PCIe port nodes Date: Sat, 20 Sep 2014 20:06:29 +0200 Message-Id: <1411236391-422-4-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_056293_67BAFD84 X-CRM114-Status: GOOD ( 11.77 ) 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 Currently, Armada XP PCIe nodes are numbered pcie@,0 with N just incrementing. To reflect port/lane relationship, rename the nodes to pcie@,. While at it, add node aliases to each of pcie controller and port nodes and get rid of now redundant port/lane comments. 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 | 11 ++++------- arch/arm/boot/dts/armada-xp-db.dts | 20 +++++++------------- arch/arm/boot/dts/armada-xp-gp.dts | 11 ++++------- arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 8 +++----- arch/arm/boot/dts/armada-xp-matrix.dts | 5 ++--- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 12 ++++++------ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 20 ++++++++++---------- arch/arm/boot/dts/armada-xp-mv78460.dtsi | 22 +++++++++++----------- arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 11 ++++------- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 5 ++--- 10 files changed, 53 insertions(+), 72 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts index 0e53fad111de..1b2dd3a4000b 100644 --- a/arch/arm/boot/dts/armada-xp-axpwifiap.dts +++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts @@ -37,24 +37,21 @@ ranges = ; - pcie-controller { + pcie: pcie-controller { status = "okay"; /* First mini-PCIe port */ - pcie@1,0 { - /* Port 0, Lane 0 */ + pcie00: pcie@0,0 { status = "okay"; }; /* Second mini-PCIe port */ - pcie@2,0 { - /* Port 0, Lane 1 */ + pcie01: pcie@0,1 { status = "okay"; }; /* Renesas uPD720202 USB 3.0 controller */ - pcie@3,0 { - /* Port 0, Lane 3 */ + pcie03: pcie@0,3 { status = "okay"; }; }; diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts index 42ddb2864365..3cda0f6e5c37 100644 --- a/arch/arm/boot/dts/armada-xp-db.dts +++ b/arch/arm/boot/dts/armada-xp-db.dts @@ -71,35 +71,29 @@ }; }; - pcie-controller { + pcie: pcie-controller { status = "okay"; /* * All 6 slots are physically present as * standard PCIe slots on the board. */ - pcie@1,0 { - /* Port 0, Lane 0 */ + pcie00: pcie@0,0 { status = "okay"; }; - pcie@2,0 { - /* Port 0, Lane 1 */ + pcie01: pcie@0,1 { status = "okay"; }; - pcie@3,0 { - /* Port 0, Lane 2 */ + pcie02: pcie@0,2 { status = "okay"; }; - pcie@4,0 { - /* Port 0, Lane 3 */ + pcie03: pcie@0,3 { status = "okay"; }; - pcie@9,0 { - /* Port 2, Lane 0 */ + pcie20: pcie@2,0 { status = "okay"; }; - pcie@10,0 { - /* Port 3, Lane 0 */ + pcie30: pcie@3,0 { status = "okay"; }; }; diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts index 0478c55ca656..30435e85ff33 100644 --- a/arch/arm/boot/dts/armada-xp-gp.dts +++ b/arch/arm/boot/dts/armada-xp-gp.dts @@ -81,23 +81,20 @@ }; }; - pcie-controller { + pcie: pcie-controller { status = "okay"; /* * The 3 slots are physically present as * standard PCIe slots on the board. */ - pcie@1,0 { - /* Port 0, Lane 0 */ + pcie00: pcie@0,0 { status = "okay"; }; - pcie@9,0 { - /* Port 2, Lane 0 */ + pcie20: pcie@2,0 { status = "okay"; }; - pcie@10,0 { - /* Port 3, Lane 0 */ + pcie30: pcie@3,0 { 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 90d9002923f5..d7607009ecdc 100644 --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts @@ -34,18 +34,16 @@ ranges = ; - pcie-controller { + pcie: pcie-controller { status = "okay"; /* Quad port sata: Marvell 88SX7042 */ - pcie@1,0 { - /* Port 0, Lane 0 */ + pcie00: pcie@0,0 { status = "okay"; }; /* USB 3.0 xHCI controller: NEC D720200F1 */ - pcie@5,0 { - /* Port 1, Lane 0 */ + pcie10: pcie@1,0 { status = "okay"; }; }; diff --git a/arch/arm/boot/dts/armada-xp-matrix.dts b/arch/arm/boot/dts/armada-xp-matrix.dts index 7e291e2ef4b3..77f9f01a9920 100644 --- a/arch/arm/boot/dts/armada-xp-matrix.dts +++ b/arch/arm/boot/dts/armada-xp-matrix.dts @@ -63,11 +63,10 @@ }; }; - pcie-controller { + pcie: pcie-controller { status = "okay"; - pcie@1,0 { - /* Port 0, Lane 0 */ + pcie00: pcie@0,0 { status = "okay"; }; }; diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 281ccd24295c..ab10499bac3e 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi @@ -52,7 +52,7 @@ * configured as x4 or quad x1 lanes. One unit is * x1 only. */ - pcie-controller { + pcie: pcie-controller { compatible = "marvell,armada-xp-pcie"; status = "disabled"; device_type = "pci"; @@ -80,7 +80,7 @@ 0x82000000 0x5 0 MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 MEM */ 0x81000000 0x5 0 MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 1.0 IO */>; - pcie@1,0 { + pcie00: pcie@0,0 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; reg = <0x0800 0 0 0 0>; @@ -97,7 +97,7 @@ status = "disabled"; }; - pcie@2,0 { + pcie01: pcie@0,1 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1000 0 0 0 0>; @@ -114,7 +114,7 @@ status = "disabled"; }; - pcie@3,0 { + pcie02: pcie@0,2 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; reg = <0x1800 0 0 0 0>; @@ -131,7 +131,7 @@ status = "disabled"; }; - pcie@4,0 { + pcie03: pcie@0,3 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>; reg = <0x2000 0 0 0 0>; @@ -148,7 +148,7 @@ status = "disabled"; }; - pcie@5,0 { + pcie10: pcie@1,0 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; reg = <0x2800 0 0 0 0>; diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index d7a8d0b0f385..ac0c3918686d 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -54,7 +54,7 @@ * configured as x4 or quad x1 lanes. One unit is * x4 only. */ - pcie-controller { + pcie: pcie-controller { compatible = "marvell,armada-xp-pcie"; status = "disabled"; device_type = "pci"; @@ -96,7 +96,7 @@ 0x82000000 0x9 0 MBUS_ID(0x04, 0xf8) 0 1 0 /* Port 2.0 MEM */ 0x81000000 0x9 0 MBUS_ID(0x04, 0xf0) 0 1 0 /* Port 2.0 IO */>; - pcie@1,0 { + pcie00: pcie@0,0 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; reg = <0x0800 0 0 0 0>; @@ -113,7 +113,7 @@ status = "disabled"; }; - pcie@2,0 { + pcie01: pcie@0,1 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1000 0 0 0 0>; @@ -130,7 +130,7 @@ status = "disabled"; }; - pcie@3,0 { + pcie02: pcie@0,2 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; reg = <0x1800 0 0 0 0>; @@ -147,7 +147,7 @@ status = "disabled"; }; - pcie@4,0 { + pcie03: pcie@0,3 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>; reg = <0x2000 0 0 0 0>; @@ -164,7 +164,7 @@ status = "disabled"; }; - pcie@5,0 { + pcie10: pcie@1,0 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; reg = <0x2800 0 0 0 0>; @@ -181,7 +181,7 @@ status = "disabled"; }; - pcie@6,0 { + pcie11: pcie@1,1 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x84000 0 0x2000>; reg = <0x3000 0 0 0 0>; @@ -198,7 +198,7 @@ status = "disabled"; }; - pcie@7,0 { + pcie12: pcie@1,2 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x88000 0 0x2000>; reg = <0x3800 0 0 0 0>; @@ -215,7 +215,7 @@ status = "disabled"; }; - pcie@8,0 { + pcie13: pcie@1,3 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x8c000 0 0x2000>; reg = <0x4000 0 0 0 0>; @@ -232,7 +232,7 @@ status = "disabled"; }; - pcie@9,0 { + pcie20: pcie@2,0 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x42000 0 0x2000>; reg = <0x4800 0 0 0 0>; diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi index 9c40c130d11a..18f904ac13c5 100644 --- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi @@ -71,7 +71,7 @@ * configured as x4 or quad x1 lanes. Two units are * x4/x1. */ - pcie-controller { + pcie: pcie-controller { compatible = "marvell,armada-xp-pcie"; status = "disabled"; device_type = "pci"; @@ -117,7 +117,7 @@ 0x82000000 0xa 0 MBUS_ID(0x08, 0xf8) 0 1 0 /* Port 3.0 MEM */ 0x81000000 0xa 0 MBUS_ID(0x08, 0xf0) 0 1 0 /* Port 3.0 IO */>; - pcie@1,0 { + pcie00: pcie@0,0 { device_type = "pci"; assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; reg = <0x0800 0 0 0 0>; @@ -134,7 +134,7 @@ status = "disabled"; }; - pcie@2,0 { + pcie01: pcie@0,1 { device_type = "pci"; assigned-addresses = <0x82001000 0 0x44000 0 0x2000>; reg = <0x1000 0 0 0 0>; @@ -151,7 +151,7 @@ status = "disabled"; }; - pcie@3,0 { + pcie02: pcie@0,2 { device_type = "pci"; assigned-addresses = <0x82001800 0 0x48000 0 0x2000>; reg = <0x1800 0 0 0 0>; @@ -168,7 +168,7 @@ status = "disabled"; }; - pcie@4,0 { + pcie03: pcie@0,3 { device_type = "pci"; assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>; reg = <0x2000 0 0 0 0>; @@ -185,7 +185,7 @@ status = "disabled"; }; - pcie@5,0 { + pcie10: pcie@1,0 { device_type = "pci"; assigned-addresses = <0x82002800 0 0x80000 0 0x2000>; reg = <0x2800 0 0 0 0>; @@ -202,7 +202,7 @@ status = "disabled"; }; - pcie@6,0 { + pcie11: pcie@1,1 { device_type = "pci"; assigned-addresses = <0x82003000 0 0x84000 0 0x2000>; reg = <0x3000 0 0 0 0>; @@ -219,7 +219,7 @@ status = "disabled"; }; - pcie@7,0 { + pcie12: pcie@1,2 { device_type = "pci"; assigned-addresses = <0x82003800 0 0x88000 0 0x2000>; reg = <0x3800 0 0 0 0>; @@ -236,7 +236,7 @@ status = "disabled"; }; - pcie@8,0 { + pcie13: pcie@1,3 { device_type = "pci"; assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>; reg = <0x4000 0 0 0 0>; @@ -253,7 +253,7 @@ status = "disabled"; }; - pcie@9,0 { + pcie20: pcie@2,0 { device_type = "pci"; assigned-addresses = <0x82004800 0 0x42000 0 0x2000>; reg = <0x4800 0 0 0 0>; @@ -270,7 +270,7 @@ status = "disabled"; }; - pcie@10,0 { + pcie30: pcie@3,0 { device_type = "pci"; assigned-addresses = <0x82005000 0 0x82000 0 0x2000>; reg = <0x5000 0 0 0 0>; diff --git a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts index 8c241d08f2a3..98beb572a46c 100644 --- a/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts +++ b/arch/arm/boot/dts/armada-xp-netgear-rn2120.dts @@ -32,24 +32,21 @@ ranges = ; - pcie-controller { + pcie: pcie-controller { status = "okay"; /* Connected to first Marvell 88SE9170 SATA controller */ - pcie@1,0 { - /* Port 0, Lane 0 */ + pcie00: pcie@0,0 { status = "okay"; }; /* Connected to second Marvell 88SE9170 SATA controller */ - pcie@2,0 { - /* Port 0, Lane 1 */ + pcie01: pcie@0,1 { status = "okay"; }; /* Connected to Fresco Logic FL1009 USB 3.0 controller */ - pcie@5,0 { - /* Port 1, Lane 0 */ + pcie10: pcie@1,0 { status = "okay"; }; }; 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 6f6b0916df48..781818614adc 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -61,11 +61,10 @@ }; }; - pcie-controller { + pcie: pcie-controller { status = "okay"; /* Internal mini-PCIe connector */ - pcie@1,0 { - /* Port 0, Lane 0 */ + pcie00: pcie@0,0 { status = "okay"; }; };