From patchwork Mon Sep 30 22:19:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 2967061 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 5CA39BFF0B for ; Mon, 30 Sep 2013 22:20:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 731632022F for ; Mon, 30 Sep 2013 22:19:59 +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 188AF20212 for ; Mon, 30 Sep 2013 22:19:58 +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 1VQlom-0003do-Ik; Mon, 30 Sep 2013 22:19:52 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQloj-0000gd-NC; Mon, 30 Sep 2013 22:19:49 +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 1VQloh-0000fg-OB for linux-arm-kernel@lists.infradead.org; Mon, 30 Sep 2013 22:19:48 +0000 Received: by smtp.natisbad.org (Postfix, from userid 5001) id 4877E2C0766; Tue, 1 Oct 2013 00:19:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1380579563; bh=ROqiBCXkTqbcem7iBaxBshUndOrh6/7P4z7uA/wzyzo=; h=From:To:Cc:Subject:Date; b=V2HAvdF7Vru3oA25eBeeIf7G/zAixoqQG2Rc6D3JcmEPeLtoTwlduymdQvcIhgzH4 mg6GGE0jd+dZZAY8o9ImykT6HVceAtGSJAGziAwMragkJEAUswUOuGg7b1e5cmfTBe 1dKCnZ3T++iFnIaqv/YSrjt/R+UzA5pPqRk8KHD8= X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.7 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 A55C12C0167; Tue, 1 Oct 2013 00:19:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=natisbad.org; s=mail; t=1380579557; bh=ROqiBCXkTqbcem7iBaxBshUndOrh6/7P4z7uA/wzyzo=; h=From:To:Cc:Subject:Date; b=dhqT1BeNE7XEI7ttGM6ItxsxNcWgbmwIIANsVfwCF7n8Qb/3B8CxRoIsp246Jq1Iu boTYx2NtyFZ/02mw7rmfiCii+qngq9HKgz20sD/gCrc+fAOUIUgdaeiNd0U6Q+GhvY Nt9pSjBUdoPWTo92zFiEI9dq0Gc5dLUgTLhDZ61Y= X-Hashcash: 1:20:130930:jason@lakedaemon.net::82AG5zqS5zWkjmJs:000000000000000000000000000000000000000000ouM X-Hashcash: 1:20:130930:andrew@lunn.ch::hfypAGUroFqkA0BA:0005L4J X-Hashcash: 1:20:130930:linux-arm-kernel@lists.infradead.org::+bP8VhoamR8mQIuR:00000000000000000000000003Ylw X-Hashcash: 1:20:130930:linux@arm.linux.org.uk::w3BpkEJzMpinZJNE:0000000000000000000000000000000000000000y3k From: arno@natisbad.org (Arnaud Ebalard) To: Jason Cooper , Andrew Lunn Subject: [PATCH, FIX] ARM: mvebu: add missing DT Mbus ranges and relocate PCIe DT nodes for RN102 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, 01 Oct 2013 00:19:16 +0200 Message-ID: <87a9iuq7ff.fsf@natisbad.org> 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-20130930_181948_166706_F7BB9D9D X-CRM114-Status: GOOD ( 13.16 ) X-Spam-Score: -1.2 (-) Cc: Russell King - ARM Linux , Linux ARM Kernel Mailing List 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 When 5e12a613 and 0cd3754a were introduced, Netgear ReadyNAS 102 .dts file was queued for inclusion and missed the update to have Mbus (and then BootROM) ranges properties declared. It also missed the relocation of Armada 370/XP PCIe DT nodes introduced by 14fd8ed0 after de1af8d4. This patch fixes that which makes 3.12-rc3 bootable on the NAS. Signed-off-by: Arnaud Ebalard --- arch/arm/boot/dts/armada-370-netgear-rn102.dts | 35 ++++++++++++++------------ 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts index 05e4485..aef5ac5 100644 --- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts +++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts @@ -27,6 +27,25 @@ }; soc { + ranges = ; + + pcie-controller { + status = "okay"; + + /* Connected to Marvell SATA controller */ + pcie@1,0 { + /* Port 0, Lane 0 */ + status = "okay"; + }; + + /* Connected to FL1009 USB 3.0 controller */ + pcie@2,0 { + /* Port 1, Lane 0 */ + status = "okay"; + }; + }; + internal-regs { serial@12000 { clock-frequency = <200000000>; @@ -89,22 +108,6 @@ pwm_polarity = <0>; }; }; - - pcie-controller { - status = "okay"; - - /* Connected to Marvell SATA controller */ - pcie@1,0 { - /* Port 0, Lane 0 */ - status = "okay"; - }; - - /* Connected to FL1009 USB 3.0 controller */ - pcie@2,0 { - /* Port 1, Lane 0 */ - status = "okay"; - }; - }; }; };