From patchwork Fri Jan 25 17:56:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 156618 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp640715jaa; Fri, 25 Jan 2019 09:56:18 -0800 (PST) X-Google-Smtp-Source: ALg8bN4tDz4b6yj2dauPdgbYDaz0mQod8E9V8Pj4YY3qoLSjcseSqjSLRu47ZqOKqhuL0/kO8BxQ X-Received: by 2002:a63:2d82:: with SMTP id t124mr10759338pgt.260.1548438978886; Fri, 25 Jan 2019 09:56:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548438978; cv=none; d=google.com; s=arc-20160816; b=B2/GEc4V9XA58qcKo03cu9e1bixwSsPGh18qTsDI3jJaguZwAkY3vppDL2DFK96yC6 ClwXETwE0vL1xsbHNDJ8y5ZJqrzJ0beR/kFph9GjnJXrg597c11LQKCNl2vCju9j3eOG qGjd/8Y5+sxX4v2TRje6BMCnG6WsUU9H3VU7RIarOyNA6wKGYw1dvDdsqbjbwMViJXxS Mj8eljLFRiod0510FHwoawVk/sojDtW01RLc39wuD8n0zo+NKz+Z84C6fBybYcgQvGb5 jK6WVwFjkfQYIv9sHVL32NbxYdI90UnqHnGjD9D9Su/5hMlAhJL+hTMmGNJMD3tP+sov 7l+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=VWq/yoq2lnSrMMnbK1hKObUJoetfucaUVzNPo3j6nc0=; b=zjNqhMxGI3jWoiXR7yxl30Tck6ii8RlA7yVJhbSayp2PhAQm3ABUJaa7wytFfHtx2o xEZLZQxfUzvzkkirg1rFADnTpPdyN1amANA+dPK3e5oAedsWuRdcxcuvQDwEz1FbNhQW 4D0aV98p8cm5ex+OyUxBH+HPIEzloP3o7Zw9zgd6XP5mYVhEzjrBEFfCfQ3G1E9tWh2H 9V3ceeKOQ7lJKDKJVAmLRrIpKsQSXtGvNGcGlJoe3AVK6+tnO5h6uow0fP/lCnTu6SWb AJXoV88REDiQStmylhYGXDPBLHzeFZlPGM83gbhloMCo7Y2h0I8zZatKyfV7dRpjhyFe TgMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c19si25063405pls.242.2019.01.25.09.56.18; Fri, 25 Jan 2019 09:56:18 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726411AbfAYR4S (ORCPT + 7 others); Fri, 25 Jan 2019 12:56:18 -0500 Received: from foss.arm.com ([217.140.101.70]:51544 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726347AbfAYR4S (ORCPT ); Fri, 25 Jan 2019 12:56:18 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C045D1650; Fri, 25 Jan 2019 09:56:17 -0800 (PST) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D4AB43F5AF; Fri, 25 Jan 2019 09:56:16 -0800 (PST) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org Cc: Sudeep Holla , devicetree@vger.kernel.org, Liviu Dudau Subject: [PATCH 3/4] arm64: dts: juno/fast models: sort couple of device nodes Date: Fri, 25 Jan 2019 17:56:05 +0000 Message-Id: <20190125175606.6607-3-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125175606.6607-1-sudeep.holla@arm.com> References: <20190125175606.6607-1-sudeep.holla@arm.com> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Sort the couple device nodes with unit addresses which are out of order. Cc: Liviu Dudau Signed-off-by: Sudeep Holla --- arch/arm64/boot/dts/arm/juno-base.dtsi | 70 +++++++++---------- .../boot/dts/arm/rtsm_ve-motherboard.dtsi | 12 ++-- 2 files changed, 41 insertions(+), 41 deletions(-) -- 2.17.1 diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 3a72c04247cb..7446e0dc154d 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -220,6 +220,41 @@ }; }; + replicator@20120000 { + compatible = "arm,coresight-dynamic-replicator", "arm,primecell"; + reg = <0 0x20120000 0 0x1000>; + + clocks = <&soc_smc50mhz>; + clock-names = "apb_pclk"; + power-domains = <&scpi_devpd 0>; + + out-ports { + #address-cells = <1>; + #size-cells = <0>; + + /* replicator output ports */ + port@0 { + reg = <0>; + replicator_out_port0: endpoint { + remote-endpoint = <&tpiu_in_port>; + }; + }; + + port@1 { + reg = <1>; + replicator_out_port1: endpoint { + remote-endpoint = <&etr_in_port>; + }; + }; + }; + in-ports { + port { + replicator_in_port0: endpoint { + }; + }; + }; + }; + cpu_debug0: cpu-debug@22010000 { compatible = "arm,coresight-cpu-debug", "arm,primecell"; reg = <0x0 0x22010000 0x0 0x1000>; @@ -452,41 +487,6 @@ }; }; - replicator@20120000 { - compatible = "arm,coresight-dynamic-replicator", "arm,primecell"; - reg = <0 0x20120000 0 0x1000>; - - clocks = <&soc_smc50mhz>; - clock-names = "apb_pclk"; - power-domains = <&scpi_devpd 0>; - - out-ports { - #address-cells = <1>; - #size-cells = <0>; - - /* replicator output ports */ - port@0 { - reg = <0>; - replicator_out_port0: endpoint { - remote-endpoint = <&tpiu_in_port>; - }; - }; - - port@1 { - reg = <1>; - replicator_out_port1: endpoint { - remote-endpoint = <&etr_in_port>; - }; - }; - }; - in-ports { - port { - replicator_in_port0: endpoint { - }; - }; - }; - }; - sram: sram@2e000000 { compatible = "arm,juno-sram-ns", "mmio-sram"; reg = <0x0 0x2e000000 0x0 0x8000>; diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi index 102e93744edc..454cf6c44c49 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi +++ b/arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi @@ -167,6 +167,12 @@ clock-names = "timclken1", "timclken2", "apb_pclk"; }; + virtio-block@130000 { + compatible = "virtio,mmio"; + reg = <0x130000 0x200>; + interrupts = <42>; + }; + rtc@170000 { compatible = "arm,pl031", "arm,primecell"; reg = <0x170000 0x1000>; @@ -193,12 +199,6 @@ }; }; }; - - virtio-block@130000 { - compatible = "virtio,mmio"; - reg = <0x130000 0x200>; - interrupts = <42>; - }; }; v2m_fixed_3v3: v2m-3v3 {