From patchwork Fri Feb 10 01:05:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 9565733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D6CB9601E9 for ; Fri, 10 Feb 2017 01:07:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7588284F2 for ; Fri, 10 Feb 2017 01:07:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC1392850F; Fri, 10 Feb 2017 01:07:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 582FD284F2 for ; Fri, 10 Feb 2017 01:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=BVN5XRy/eKwjdb/6vdbXgL5VzXX3UoyFKheHCAKJjE4=; b=L4Ss7975SrLirmkOlKNqecJ9fe wWNlFpEzpqk3NDeS6SkNkBiB9xI7MUEq9afHHkEZr2aY6yP3VKfRNOaMKSNbOtvssLUE5fQJI2B2E J8vUCw6Rj462BydJR8pMwt3YjGbS+AZ2a307czId/dcOf6DbpesLjT1Wgc5mZS0ly/HGmCC4FGwK6 hEcO2CXlzO3U7VTTTPLYq9ehJ3UhFzWC5OE/AC2IBxv0/jxLRg1Bf2Sfa7sJ4idGqLrBzcs0eoFWm 5LeAhvtsEBL4/ElRFzwv9RwMZjDyQrGQweOB0QrZDWc+5O3uRnsxyrem+hzVceo9my0ndUEEEtDdZ DFUuSxcQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cbzgM-0006wi-AC; Fri, 10 Feb 2017 01:07:26 +0000 Received: from mail-pg0-x22b.google.com ([2607:f8b0:400e:c05::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cbzew-0005cK-6S for linux-rockchip@lists.infradead.org; Fri, 10 Feb 2017 01:06:06 +0000 Received: by mail-pg0-x22b.google.com with SMTP id 204so5245405pge.0 for ; Thu, 09 Feb 2017 17:05:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ND4RMD3fP7lh7mcqOu94nri7btcvDqYo3lvmdFDI1HE=; b=Pc0q060QY6KRvnVGEc4aHU4PUNa4AxXv1g+J9kJAMI3mfPPQ1XmNwpAUCvpyfKfB1v axyuy7cm0G3t1HXVwulPNPDJGEuUb4Dn5M7XzrcBGYCRA6orfLf9zfiWpbPMP/u49DGv PJDu+GL1+ER8h0VFwSY8qPwTKqT6EXGgwFvi4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ND4RMD3fP7lh7mcqOu94nri7btcvDqYo3lvmdFDI1HE=; b=FQsVSnWIg183qpLjmtquWekYt2Oz1x+JZDO7op7gw/KNdk2283NZFVjiykVU72Cih3 zjVYIJlSSC6tCivDvu5tqQh5rTOAp0aYnZ0M9dvY8IcZPTvpyt60ao8jXDFKw/w/wbap 3+zbJMnmEe23gD/umU9hbaxC7ni9PkHPIeIQ7gJPGurnnJL0dvpI91GGKOBFUVCLOOJ/ O7AQmeY1f+z4oeKDgBkTq0BLJGbjoDaFmQHwSoAHHhNKrp9wJcQ0E2O9X84yYAaiuknz ukWRmzG6pCMQuIjBkSBA5mGpfE0yshMeHL8wZFR3LidVI92oOa8aN9kEbEObWVmU0Bk1 qBGA== X-Gm-Message-State: AMke39nBItR0A7qiEmbJRMcmvYUjOT47M1KbJ/qZhOmJ3iI2JpmGJD8pFTYKsHIs3YMKJ2Zu X-Received: by 10.99.163.2 with SMTP id s2mr7474605pge.43.1486688738024; Thu, 09 Feb 2017 17:05:38 -0800 (PST) Received: from ban.mtv.corp.google.com ([172.22.64.120]) by smtp.gmail.com with ESMTPSA id 89sm74741pfo.40.2017.02.09.17.05.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Feb 2017 17:05:37 -0800 (PST) From: Brian Norris To: Heiko Stuebner Subject: [PATCH v2 6/6] arm64: dts: rockchip: sort rk3399 by unit address Date: Thu, 9 Feb 2017 17:05:21 -0800 Message-Id: <20170210010521.78872-7-briannorris@chromium.org> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog In-Reply-To: <20170210010521.78872-1-briannorris@chromium.org> References: <20170210010521.78872-1-briannorris@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170209_170558_565437_37B5DF69 X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Brian Norris , Doug Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , Chris Zhong , Stephen Barber , linux-arm-kernel@lists.infradead.org, Caesar Wang MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP f8000000 is less than all the other (top-level) unit addresses. Signed-off-by: Brian Norris --- v2: new --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 88 ++++++++++++++++---------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index a9702c29d71a..f5681bea1271 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -211,6 +211,50 @@ }; }; + pcie0: pcie@f8000000 { + compatible = "rockchip,rk3399-pcie"; + reg = <0x0 0xf8000000 0x0 0x2000000>, + <0x0 0xfd000000 0x0 0x1000000>; + reg-names = "axi-base", "apb-base"; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; + aspm-no-l0s; + bus-range = <0x0 0x1>; + clocks = <&cru ACLK_PCIE>, <&cru ACLK_PERF_PCIE>, + <&cru PCLK_PCIE>, <&cru SCLK_PCIE_PM>; + clock-names = "aclk", "aclk-perf", + "hclk", "pm"; + interrupts = , + , + ; + interrupt-names = "sys", "legacy", "client"; + interrupt-map-mask = <0 0 0 7>; + interrupt-map = <0 0 0 1 &pcie0_intc 0>, + <0 0 0 2 &pcie0_intc 1>, + <0 0 0 3 &pcie0_intc 2>, + <0 0 0 4 &pcie0_intc 3>; + max-link-speed = <1>; + msi-map = <0x0 &its 0x0 0x1000>; + phys = <&pcie_phy>; + phy-names = "pcie-phy"; + ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x600000 + 0x81000000 0x0 0xfa600000 0x0 0xfa600000 0x0 0x100000>; + resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>, + <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>, + <&cru SRST_PCIE_PM>, <&cru SRST_P_PCIE>, + <&cru SRST_A_PCIE>; + reset-names = "core", "mgmt", "mgmt-sticky", "pipe", + "pm", "pclk", "aclk"; + status = "disabled"; + + pcie0_intc: interrupt-controller { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <1>; + }; + }; + gmac: ethernet@fe300000 { compatible = "rockchip,rk3399-gmac"; reg = <0x0 0xfe300000 0x0 0x10000>; @@ -275,50 +319,6 @@ status = "disabled"; }; - pcie0: pcie@f8000000 { - compatible = "rockchip,rk3399-pcie"; - reg = <0x0 0xf8000000 0x0 0x2000000>, - <0x0 0xfd000000 0x0 0x1000000>; - reg-names = "axi-base", "apb-base"; - #address-cells = <3>; - #size-cells = <2>; - #interrupt-cells = <1>; - aspm-no-l0s; - bus-range = <0x0 0x1>; - clocks = <&cru ACLK_PCIE>, <&cru ACLK_PERF_PCIE>, - <&cru PCLK_PCIE>, <&cru SCLK_PCIE_PM>; - clock-names = "aclk", "aclk-perf", - "hclk", "pm"; - interrupts = , - , - ; - interrupt-names = "sys", "legacy", "client"; - interrupt-map-mask = <0 0 0 7>; - interrupt-map = <0 0 0 1 &pcie0_intc 0>, - <0 0 0 2 &pcie0_intc 1>, - <0 0 0 3 &pcie0_intc 2>, - <0 0 0 4 &pcie0_intc 3>; - max-link-speed = <1>; - msi-map = <0x0 &its 0x0 0x1000>; - phys = <&pcie_phy>; - phy-names = "pcie-phy"; - ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x600000 - 0x81000000 0x0 0xfa600000 0x0 0xfa600000 0x0 0x100000>; - resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>, - <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>, - <&cru SRST_PCIE_PM>, <&cru SRST_P_PCIE>, - <&cru SRST_A_PCIE>; - reset-names = "core", "mgmt", "mgmt-sticky", "pipe", - "pm", "pclk", "aclk"; - status = "disabled"; - - pcie0_intc: interrupt-controller { - interrupt-controller; - #address-cells = <0>; - #interrupt-cells = <1>; - }; - }; - usb_host0_ehci: usb@fe380000 { compatible = "generic-ehci"; reg = <0x0 0xfe380000 0x0 0x20000>;