Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp48064imm; Tue, 5 Jun 2018 14:48:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKlIkGZRBuCZlJj1i2cROlZcEUtSPOGKPgqMzXyEuiVq+uvcAKatGlPIXG5WjJyxWw9KcZj X-Received: by 2002:a17:902:728a:: with SMTP id d10-v6mr373116pll.192.1528235318128; Tue, 05 Jun 2018 14:48:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528235318; cv=none; d=google.com; s=arc-20160816; b=kShqttri9tDVPF0vCpdZ26h+f1nfDrTAHoOGtU64liItgPwAhGjjBmNrCgB94RCjS0 52NA/nDO37Il+9ng9Hz2MQWezi9+y9UL10LM+CfYH5zmuK/FqfA3crWNBilBB5SxVQC0 1h9HU9xK9Ng33MjFdkn8S706J1sFbQdzwUt+yJnrHRQy1vm2iNcApZpMTa3i6XFvUB0U ojKXSDVI6DNmH12gq2Pjs3AzXVcLiN5YSCAg9bZhRyVGqiUO+Nyg37pwk1bPQtYNJHVF GfDa0ZCqr2teX8MKWhVgFP+ge3hBPZrxhpdyg8eyne/1ZDl4ogvzqk3sxmVOxv5yxTAz CSDg== 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:arc-authentication-results; bh=z0XbB+cMMG/l6lzoXt8nlweHS2Lejbl/cPHwBw4XneE=; b=NJmVv1amrAmEv6VJDUsYQJk85PkURhlmICv/QTzjAzXlQz+iPsqEGtFcEPC/NpdauW 8M8Gf/3yJCLNBXu7Eg/lbkZyFjQa1Zqp8nqpBE+/BWgtKHoWIbU4FnPOZ9UhUqmjWDTe VA4qrVqHBbdMw9XSA757tPc0dIqst0QIPhmAY1DKKbBYGpO4qaBSdluYzDNuvHBNvNtw jesZzOsdYvp8r+bDgudZLiEu09jrutZ2RBilccmEE6KEVVR0R/t8VsvS16OjxkCCzfl0 0ZSEAUQ1IQfSqYlxlW9AOyzEzsnIjSs5TlK7A5c3v2RgcVedT5y0UNY0Rzo/OFN4zqrE n+qw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 c24-v6si7104086pgn.509.2018.06.05.14.48.24; Tue, 05 Jun 2018 14:48:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752863AbeFEVpQ (ORCPT + 99 others); Tue, 5 Jun 2018 17:45:16 -0400 Received: from foss.arm.com ([217.140.101.70]:34548 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751780AbeFEVpM (ORCPT ); Tue, 5 Jun 2018 17:45:12 -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 3D53B15BF; Tue, 5 Jun 2018 14:45:12 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.206.73]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 93DEF3F59D; Tue, 5 Jun 2018 14:45:09 -0700 (PDT) From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Cc: mathieu.poirier@linaro.org, robh@kernel.org, frowand.list@gmail.com, mark.rutland@arm.com, sudeep.holla@arm.com, arm@kernel.org, linux-kernel@vger.kernel.org, matt.sealey@arm.com, john.horley@arm.com, charles.garcia-tobin@arm.com, coresight@lists.linaro.org, devicetree@vger.kernel.org, mike.leach@linaro.org, Suzuki K Poulose , Liviu Dudau Subject: [PATCH 10/20] dts: juno: Update coresight bindings for hw port Date: Tue, 5 Jun 2018 22:43:21 +0100 Message-Id: <1528235011-30691-11-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528235011-30691-1-git-send-email-suzuki.poulose@arm.com> References: <1528235011-30691-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Switch to updated coresight bindings for hw ports. Cc: Sudeep Holla Cc: Liviu Dudau Cc: Mathieu Poirier Signed-off-by: Suzuki K Poulose --- Changes since V1: - Add support Juno for r1 & r2. --- arch/arm64/boot/dts/arm/juno-base.dtsi | 82 ++++++++++++++++++++++--------- arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 26 +++++++--- arch/arm64/boot/dts/arm/juno.dts | 5 +- 3 files changed, 81 insertions(+), 32 deletions(-) diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index eb749c5..33b41ba 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -122,15 +122,18 @@ port@0 { reg = <0>; etf0_in_port: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&main_funnel_out_port>; + coresight,hwid = <0>; }; }; /* output port */ port@1 { - reg = <0>; + reg = <1>; etf0_out_port: endpoint { + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -145,8 +148,9 @@ power-domains = <&scpi_devpd 0>; port { tpiu_in_port: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&replicator_out_port0>; + coresight,hwid = <0>; }; }; }; @@ -168,23 +172,27 @@ reg = <0>; main_funnel_out_port: endpoint { remote-endpoint = <&etf0_in_port>; + coresight,hwid = <0>; + direction = <1>; }; }; /* input ports */ port@1 { - reg = <0>; + reg = <1>; main_funnel_in_port0: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster0_funnel_out_port>; + coresight,hwid = <0>; }; }; port@2 { - reg = <1>; + reg = <2>; main_funnel_in_port1: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster1_funnel_out_port>; + coresight,hwid = <1>; }; }; }; @@ -200,8 +208,9 @@ power-domains = <&scpi_devpd 0>; port { etr_in_port: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&replicator_out_port1>; + coresight,hwid = <0>; }; }; }; @@ -217,6 +226,8 @@ power-domains = <&scpi_devpd 0>; port { stm_out_port: endpoint { + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -240,6 +251,8 @@ port { cluster0_etm0_out_port: endpoint { remote-endpoint = <&cluster0_funnel_in_port0>; + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -259,22 +272,26 @@ reg = <0>; cluster0_funnel_out_port: endpoint { remote-endpoint = <&main_funnel_in_port0>; + coresight,hwid = <0>; + direction = <1>; }; }; port@1 { - reg = <0>; + reg = <1>; cluster0_funnel_in_port0: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster0_etm0_out_port>; + coresight,hwid = <0>; }; }; port@2 { - reg = <1>; + reg = <2>; cluster0_funnel_in_port1: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster0_etm1_out_port>; + coresight,hwid = <1>; }; }; }; @@ -299,6 +316,8 @@ port { cluster0_etm1_out_port: endpoint { remote-endpoint = <&cluster0_funnel_in_port1>; + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -322,6 +341,8 @@ port { cluster1_etm0_out_port: endpoint { remote-endpoint = <&cluster1_funnel_in_port0>; + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -341,36 +362,42 @@ reg = <0>; cluster1_funnel_out_port: endpoint { remote-endpoint = <&main_funnel_in_port1>; + coresight,hwid = <0>; + direction = <1>; }; }; port@1 { - reg = <0>; + reg = <1>; cluster1_funnel_in_port0: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster1_etm0_out_port>; + coresight,hwid = <0>; }; }; port@2 { - reg = <1>; + reg = <2>; cluster1_funnel_in_port1: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster1_etm1_out_port>; + coresight,hwid = <1>; }; }; port@3 { - reg = <2>; + reg = <3>; cluster1_funnel_in_port2: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster1_etm2_out_port>; + coresight,hwid = <2>; }; }; port@4 { - reg = <3>; + reg = <4>; cluster1_funnel_in_port3: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&cluster1_etm3_out_port>; + coresight,hwid = <3>; }; }; }; @@ -395,6 +422,8 @@ port { cluster1_etm1_out_port: endpoint { remote-endpoint = <&cluster1_funnel_in_port1>; + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -418,6 +447,8 @@ port { cluster1_etm2_out_port: endpoint { remote-endpoint = <&cluster1_funnel_in_port2>; + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -441,6 +472,8 @@ port { cluster1_etm3_out_port: endpoint { remote-endpoint = <&cluster1_funnel_in_port3>; + coresight,hwid = <0>; + direction = <1>; }; }; }; @@ -462,6 +495,8 @@ reg = <0>; replicator_out_port0: endpoint { remote-endpoint = <&tpiu_in_port>; + coresight,hwid = <0>; + direction = <1>; }; }; @@ -469,14 +504,17 @@ reg = <1>; replicator_out_port1: endpoint { remote-endpoint = <&etr_in_port>; + coresight,hwid = <1>; + direction = <1>; }; }; /* replicator input port */ port@2 { - reg = <0>; + reg = <2>; replicator_in_port0: endpoint { - slave-mode; + direction = <0>; + coresight,hwid = <0>; }; }; }; diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi index 0c43fb3..146a5d9 100644 --- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi +++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi @@ -15,15 +15,18 @@ port@0 { reg = <0>; csys1_funnel_out_port: endpoint { + coresight,hwid = <0>; + direction = <1>; remote-endpoint = <&etf1_in_port>; }; }; /* input port */ port@1 { - reg = <0>; + reg = <1>; csys1_funnel_in_port0: endpoint { - slave-mode; + coresight,hwid = <0>; + direction = <0>; }; }; @@ -45,15 +48,18 @@ port@0 { reg = <0>; etf1_in_port: endpoint { - slave-mode; + direction = <0>; + coresight,hwid = <0>; remote-endpoint = <&csys1_funnel_out_port>; }; }; /* output port */ port@1 { - reg = <0>; + reg = <1>; etf1_out_port: endpoint { + coresight,hwid = <0>; + direction = <1>; remote-endpoint = <&csys2_funnel_in_port1>; }; }; @@ -75,23 +81,27 @@ port@0 { reg = <0>; csys2_funnel_out_port: endpoint { + coresight,hwid = <0>; + direction = <1>; remote-endpoint = <&replicator_in_port0>; }; }; /* input ports */ port@1 { - reg = <0>; + reg = <1>; csys2_funnel_in_port0: endpoint { - slave-mode; + direction = <0>; + coresight,hwid = <0>; remote-endpoint = <&etf0_out_port>; }; }; port@2 { - reg = <1>; + reg = <2>; csys2_funnel_in_port1: endpoint { - slave-mode; + direction = <0>; + coresight,hwid = <1>; remote-endpoint = <&etf1_out_port>; }; }; diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index c9236c4..27b8036 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -260,10 +260,11 @@ &main_funnel { ports { port@3 { - reg = <2>; + reg = <3>; main_funnel_in_port2: endpoint { - slave-mode; + direction = <0>; remote-endpoint = <&stm_out_port>; + coresight,hwid = <2>; }; }; }; -- 2.7.4