From patchwork Wed May 16 10:34:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 135992 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp735405lji; Wed, 16 May 2018 03:34:38 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpetu6sRwOC1dW+Lhsk31YbA+O/XedGHhMd9spRSqBTpToJD87LZ7iB+ATE/17D5S4PRq3I X-Received: by 2002:a17:902:5327:: with SMTP id b36-v6mr363674pli.316.1526466878239; Wed, 16 May 2018 03:34:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526466878; cv=none; d=google.com; s=arc-20160816; b=EttT3hc8aE4XsL+nt9w0R6qZpKlaFqTIesh/r3R9CMwIOax99NpP4Jz+ML0dHm4Pj6 MCoyxa8LXS7cOKwbYlIvA8G9tncmOzAtLcxTvaDswfLP6GHGrKSBb2DdtIXswkMFI+N5 oEK4Cr1ZkXEtCWZCHlVVhe+8lXLXOh8TkrZ0k74OjOB2kGOaPVCquTwy28jPQ/qqN6Ns 1G4dYLfNd87XTOuSPGTyUfbORR4fv02D/02HSkQ/Mjmk6RUb9VoqBMa1wTO5kBceBWp9 HaW3K9iMuylbb437zHgKn6lFsn8MqSXS5b6oLBXRPGA4rhZL1l9svX/tFs9KyguJewHr LmHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=DKTu2Bk1E+ysLUoTaIntNF2vDd66rBkh2ZJHrPNVCCc=; b=y7Rg45Ve70MbpumY7UEjbnH1wvYPMRWl0uFQV0Sm011cSmkhHjd+3YLsYfV4SBJbgo uMtx+eHZ2CFvaUhrfoFAvKus3Swh3atbGNkJBLN7SGP+0RfIESMv4c8Yn0S/1bgx73ir A06xylWgvWsatyiDbyZY9zgdVS3EDFxHSiqlF1KOfj4Br5QfefN3JSm7f9O8U7yJ33jM hvAFCXKPB8Ui14xwKsId+eRtyVCE510eLca8BGjm8/o8gaFNJKbPuYuk0w7RcawmPpCu QScVy/ywtFtTtTN28YDOxb3QSljJDaxtoV2yXeydgmEuf5dmw2u4fhyyRIPaBmrrB8Ze 3hiQ== 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 x10-v6si1866245pgo.679.2018.05.16.03.34.38; Wed, 16 May 2018 03:34:38 -0700 (PDT) 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 S1752081AbeEPKeh (ORCPT + 5 others); Wed, 16 May 2018 06:34:37 -0400 Received: from foss.arm.com ([217.140.101.70]:45734 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbeEPKeg (ORCPT ); Wed, 16 May 2018 06:34:36 -0400 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 7DA9E1435; Wed, 16 May 2018 03:34:36 -0700 (PDT) Received: from usa.arm.com (unknown [10.1.210.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4B1A53F53D; Wed, 16 May 2018 03:34:35 -0700 (PDT) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Cc: Sudeep Holla , Suzuki K Poulose , Mathieu Poirier , Liviu Dudau Subject: [PATCH] arm64: dts: juno: fix graph node unit addresses for coresight components Date: Wed, 16 May 2018 11:34:22 +0100 Message-Id: <1526466862-19173-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Currently the coresight components graph node unit addresses are continuous for both input and output ports while the "reg" properties are restarted for input and output ports separately. This results is the following DTC warnings: (graph_port): /etf@20010000/ports/port@1: graph node unit address error, expected "0" (graph_port): /etf@20140000/ports/port@1: graph node unit address error, expected "0" (graph_port): /funnel@20040000/ports/port@1: graph node unit address error, expected "0" (graph_port): /funnel@20040000/ports/port@2: graph node unit address error, expected "1" (graph_port): /funnel@20040000/ports/port@3: graph node unit address error, expected "2" (graph_port): /funnel@20130000/ports/port@1: graph node unit address error, expected "0" (graph_port): /funnel@20150000/ports/port@1: graph node unit address error, expected "0" (graph_port): /funnel@20150000/ports/port@2: graph node unit address error, expected "1" (graph_port): /funnel@220c0000/ports/port@1: graph node unit address error, expected "0" (graph_port): /funnel@220c0000/ports/port@2: graph node unit address error, expected "1" (graph_port): /funnel@230c0000/ports/port@1: graph node unit address error, expected "0" (graph_port): /funnel@230c0000/ports/port@2: graph node unit address error, expected "1" (graph_port): /funnel@230c0000/ports/port@3: graph node unit address error, expected "2" (graph_port): /funnel@230c0000/ports/port@4: graph node unit address error, expected "3" (graph_port): /replicator@20120000/ports/port@2: graph node unit address error, expected "0" This patch makes even the reg property to follow the continuous numbering as in the graph node unit address. Cc: Suzuki K Poulose Cc: Mathieu Poirier Cc: Liviu Dudau Signed-off-by: Sudeep Holla --- arch/arm64/boot/dts/arm/juno-base.dtsi | 20 ++++++++++---------- arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 8 ++++---- arch/arm64/boot/dts/arm/juno.dts | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) Hi Suzuki/Mathieu, I did a quick scan @ drivers/hwtracing/coresight/of_coresight.c to check if reg field is being used or not and whether this change causes any regression. I don't think so, but I may be wrong, let me know. -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index 708a15887af4..dbeca292a57c 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -131,7 +131,7 @@ /* output port */ port@1 { - reg = <0>; + reg = <1>; etf0_out_port: endpoint { }; }; @@ -175,7 +175,7 @@ /* input ports */ port@1 { - reg = <0>; + reg = <1>; main_funnel_in_port0: endpoint { slave-mode; remote-endpoint = <&cluster0_funnel_out_port>; @@ -183,7 +183,7 @@ }; port@2 { - reg = <1>; + reg = <2>; main_funnel_in_port1: endpoint { slave-mode; remote-endpoint = <&cluster1_funnel_out_port>; @@ -265,7 +265,7 @@ }; port@1 { - reg = <0>; + reg = <1>; cluster0_funnel_in_port0: endpoint { slave-mode; remote-endpoint = <&cluster0_etm0_out_port>; @@ -273,7 +273,7 @@ }; port@2 { - reg = <1>; + reg = <2>; cluster0_funnel_in_port1: endpoint { slave-mode; remote-endpoint = <&cluster0_etm1_out_port>; @@ -347,7 +347,7 @@ }; port@1 { - reg = <0>; + reg = <1>; cluster1_funnel_in_port0: endpoint { slave-mode; remote-endpoint = <&cluster1_etm0_out_port>; @@ -355,21 +355,21 @@ }; port@2 { - reg = <1>; + reg = <2>; cluster1_funnel_in_port1: endpoint { slave-mode; remote-endpoint = <&cluster1_etm1_out_port>; }; }; port@3 { - reg = <2>; + reg = <3>; cluster1_funnel_in_port2: endpoint { slave-mode; remote-endpoint = <&cluster1_etm2_out_port>; }; }; port@4 { - reg = <3>; + reg = <4>; cluster1_funnel_in_port3: endpoint { slave-mode; remote-endpoint = <&cluster1_etm3_out_port>; @@ -476,7 +476,7 @@ /* replicator input port */ port@2 { - reg = <0>; + reg = <2>; replicator_in_port0: endpoint { slave-mode; }; diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi index 21287f2d75d3..a99f311c8dcb 100644 --- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi +++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi @@ -21,7 +21,7 @@ /* input port */ port@1 { - reg = <0>; + reg = <1>; csys1_funnel_in_port0: endpoint { slave-mode; }; @@ -52,7 +52,7 @@ /* output port */ port@1 { - reg = <0>; + reg = <1>; etf1_out_port: endpoint { remote-endpoint = <&csys2_funnel_in_port1>; }; @@ -81,7 +81,7 @@ /* input ports */ port@1 { - reg = <0>; + reg = <1>; csys2_funnel_in_port0: endpoint { slave-mode; remote-endpoint = <&etf0_out_port>; @@ -89,7 +89,7 @@ }; port@2 { - reg = <1>; + reg = <2>; csys2_funnel_in_port1: endpoint { slave-mode; remote-endpoint = <&etf1_out_port>; diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index aa3b341a7547..34e940e7465b 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -260,7 +260,7 @@ &main_funnel { ports { port@3 { - reg = <2>; + reg = <3>; main_funnel_in_port2: endpoint { slave-mode; remote-endpoint = <&stm_out_port>;