From patchwork Tue Nov 5 20:45:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 3143901 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 7D19A9F407 for ; Tue, 5 Nov 2013 20:47:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55A1320265 for ; Tue, 5 Nov 2013 20:47:15 +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 1C03720249 for ; Tue, 5 Nov 2013 20:47:14 +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 1VdnWJ-0005vN-SR; Tue, 05 Nov 2013 20:46:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VdnW9-00052h-K9; Tue, 05 Nov 2013 20:46:29 +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 1VdnW6-00050h-U2 for linux-arm-kernel@lists.infradead.org; Tue, 05 Nov 2013 20:46:27 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id D35A32C0CCC; Tue, 5 Nov 2013 21:46:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1383684363; bh=Wo+FxtDAJYC9imoXzCWwcCCTa/lD2v/1jKxjl1UkPss=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=BPo5uv1I7piP6zYGZAnrn/VuzHXYfxu95bIBs86sg/RxmbP+umEMsIf9SgbfWcuqk EZdF8F9tq04C/ekGZHaWA+cU67s7OIUYN6Dyhg0Lull/bdzb5jD0cmEAGhR29q754f yDdnr8uBYXZ07ZVARpH7+5cc0l3GIx+M6fZS0rp0= 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 E3CA82C04E1; Tue, 5 Nov 2013 21:45:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1383684349; bh=Wo+FxtDAJYC9imoXzCWwcCCTa/lD2v/1jKxjl1UkPss=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=HZoGKaxyk94fdyUhQE4HlVuahT6MO8WzntJRE4sLNFUaVluYnWrAFHsuQSVUpiPo+ jn3JjoXydoR8Bd1HuTcN9gCcOqISCHYWnXwAeXXSIw9Ee0WTrgtJXPKahVBySf8wlF oatQaeWMOwKomQaRIeVjWvGOBk65t4V9YctpwZFw= X-Hashcash: 1:20:131105:jason@lakedaemon.net::tTqZ1XfscF6zd7cD:000000000000000000000000000000000000000000qbh X-Hashcash: 1:20:131105:andrew@lunn.ch::XlAlIgCgeEi3qE2x:000042v X-Hashcash: 1:20:131105:gregory.clement@free-electrons.com::CWTNFXxRnZo2WH5z:00000000000000000000000000021kB X-Hashcash: 1:20:131105:sebastian.hesselbarth@gmail.com::mbL6MET/C+X6hpbA:0000000000000000000000000000001qSk X-Hashcash: 1:20:131105:ezequiel.garcia@free-electrons.com::Xw3lNVWW6Uz+BhA7:000000000000000000000000000EaIL X-Hashcash: 1:20:131105:thomas.petazzoni@free-electrons.com::cQEK+nNcZ+uKPFDe:00000000000000000000000000A+yw X-Hashcash: 1:20:131105:linux@arm.linux.org.uk::c640LBE+6/ujfehz:000000000000000000000000000000000000000Dmv7 X-Hashcash: 1:20:131105:linux-arm-kernel@lists.infradead.org::x5OW10btq7+dMFmr:00000000000000000000000000Hj4 X-Hashcash: 1:20:131105:alior@marvell.com::aEimsP6Ct5tokZ6c:000000000000000000000000000000000000000000006ZqZ From: arno@natisbad.org (Arnaud Ebalard) To: Jason Cooper , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Ezequiel Garcia , Thomas Petazzoni Subject: [PATCH 1/2] ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable In-Reply-To: References: Message-Id: X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: D3A5 B68A 839B 38A5 815A 781B B77C 0748 A7AE 341B Date: Tue, 05 Nov 2013 21:45:48 +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-20131105_154627_285226_DCAA0A9D X-CRM114-Status: GOOD ( 12.88 ) X-Spam-Score: -1.0 (-) Cc: Lior Amsalem , Russell King , 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 Various Marvell datasheets advertise second PCIe unit of mv78230 flavour of Armada XP as x4/quad x1 capable. This second unit is in fact only x1 capable. This patch fixes current mv78230 .dtsi to reflect that, i.e. makes 1.0 the second interface (instead of 2.0 at the moment). This was successfully tested on a mv78230-based ReadyNAS 2120 platform with a x1 device (FL1009 XHCI controller) connected to this second interface. Signed-off-by: Arnaud Ebalard Acked-by: Thomas Petazzoni --- arch/arm/boot/dts/armada-xp-mv78230.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index 0358a33..9dc7381 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi @@ -47,7 +47,7 @@ /* * MV78230 has 2 PCIe units Gen2.0: One unit can be * configured as x4 or quad x1 lanes. One unit is - * x4/x1. + * x1 only. */ pcie-controller { compatible = "marvell,armada-xp-pcie"; @@ -61,10 +61,10 @@ ranges = <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000 /* Port 0.0 registers */ - 0x82000000 0 0x42000 MBUS_ID(0xf0, 0x01) 0x42000 0 0x00002000 /* Port 2.0 registers */ 0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000 /* Port 0.1 registers */ 0x82000000 0 0x48000 MBUS_ID(0xf0, 0x01) 0x48000 0 0x00002000 /* Port 0.2 registers */ 0x82000000 0 0x4c000 MBUS_ID(0xf0, 0x01) 0x4c000 0 0x00002000 /* Port 0.3 registers */ + 0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000 /* Port 1.0 registers */ 0x82000000 0x1 0 MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */ 0x81000000 0x1 0 MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO */ 0x82000000 0x2 0 MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */ @@ -73,8 +73,8 @@ 0x81000000 0x3 0 MBUS_ID(0x04, 0xb0) 0 1 0 /* Port 0.2 IO */ 0x82000000 0x4 0 MBUS_ID(0x04, 0x78) 0 1 0 /* Port 0.3 MEM */ 0x81000000 0x4 0 MBUS_ID(0x04, 0x70) 0 1 0 /* Port 0.3 IO */ - 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 */>; + 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 { device_type = "pci"; @@ -144,20 +144,20 @@ status = "disabled"; }; - pcie@9,0 { + pcie@5,0 { device_type = "pci"; - assigned-addresses = <0x82000800 0 0x42000 0 0x2000>; - reg = <0x4800 0 0 0 0>; + assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; + reg = <0x2800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; #interrupt-cells = <1>; - ranges = <0x82000000 0 0 0x82000000 0x9 0 1 0 - 0x81000000 0 0 0x81000000 0x9 0 1 0>; + ranges = <0x82000000 0 0 0x82000000 0x5 0 1 0 + 0x81000000 0 0 0x81000000 0x5 0 1 0>; interrupt-map-mask = <0 0 0 0>; - interrupt-map = <0 0 0 0 &mpic 99>; - marvell,pcie-port = <2>; + interrupt-map = <0 0 0 0 &mpic 62>; + marvell,pcie-port = <1>; marvell,pcie-lane = <0>; - clocks = <&gateclk 26>; + clocks = <&gateclk 9>; status = "disabled"; }; };