From: mathieu.poirier@linaro.org (Mathieu Poirier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 2/3] arm64: dts: juno: fix CoreSight support for Juno r1/r2 variants
Date: Thu, 12 Jan 2017 09:51:37 -0700 [thread overview]
Message-ID: <CANLsYkymGdrM8z-ZWan0Fn+Ymq97oHAJtW3G0YdUAxpWSf+aaw@mail.gmail.com> (raw)
In-Reply-To: <1484234410-7670-3-git-send-email-sudeep.holla@arm.com>
On 12 January 2017 at 08:20, Sudeep Holla <sudeep.holla@arm.com> wrote:
> From: Mike Leach <mike.leach@linaro.org>
>
> The CoreSight support added for Juno is valid for only Juno r0.
> The Juno r1 and r2 variants have additional components and alternative
> connection routes between trace source and sinks.
>
> This patch builds on top of the existing r0 support and extends it to
> Juno r1/r2 variants.
>
> Signed-off-by: Mike Leach <mike.leach@linaro.org>
> [sudeep.holla at arm.com: minor changelog update and reorganising the common
> coresight components back into juno-base.dtsi to avoid duplication]
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> ---
> arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi | 102 ++++++++++++++++++++++++++++++
> arch/arm64/boot/dts/arm/juno-r1.dts | 9 +++
> arch/arm64/boot/dts/arm/juno-r2.dts | 9 +++
> 3 files changed, 120 insertions(+)
> create mode 100644 arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
>
> diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
> new file mode 100644
> index 000000000000..89fcef366ff9
> --- /dev/null
> +++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
> @@ -0,0 +1,102 @@
> + csys1_funnel at 20130000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0 0x20130000 0 0x1000>;
> +
> + clocks = <&soc_smc50mhz>;
> + clock-names = "apb_pclk";
> + power-domains = <&scpi_devpd 0>;
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* input port */
> + port at 0 {
> + reg = <0>;
> + csys1_funnel_out_port: endpoint {
> + remote-endpoint =
> + <&etf1_in_port>;
> + };
> + };
> +
> + /* output port */
> + port at 1 {
> + reg = <0>;
> + csys1_funnel_in_port0: endpoint {
> + slave-mode;
> + };
> + };
The comments related to the input and output port are reversed.
> +
> + };
> + };
> +
> + etf1 at 20140000 {
> + compatible = "arm,coresight-tmc", "arm,primecell";
> + reg = <0 0x20140000 0 0x1000>;
> +
> + clocks = <&soc_smc50mhz>;
> + clock-names = "apb_pclk";
> + power-domains = <&scpi_devpd 0>;
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* input port */
> + port at 0 {
> + reg = <0>;
> + etf1_in_port: endpoint {
> + slave-mode;
> + remote-endpoint =
> + <&csys1_funnel_out_port>;
> + };
> + };
> +
> + /* output port */
> + port at 1 {
> + reg = <0>;
> + etf1_out_port: endpoint {
> + remote-endpoint =
> + <&csys2_funnel_in_port1>;
> + };
> + };
> + };
> + };
> +
> + csys2_funnel at 20150000 {
> + compatible = "arm,coresight-funnel", "arm,primecell";
> + reg = <0 0x20150000 0 0x1000>;
> +
> + clocks = <&soc_smc50mhz>;
> + clock-names = "apb_pclk";
> + power-domains = <&scpi_devpd 0>;
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* output port */
> + port at 0 {
> + reg = <0>;
> + csys2_funnel_out_port: endpoint {
> + remote-endpoint =
> + <&replicator_in_port0>;
> + };
> + };
> +
> + /* input ports */
> + port at 1 {
> + reg = <0>;
> + csys2_funnel_in_port0: endpoint {
> + slave-mode;
> + remote-endpoint = <&etf0_out_port>;
> + };
> + };
> +
> + port at 2 {
> + reg = <1>;
> + csys2_funnel_in_port1: endpoint {
> + slave-mode;
> + remote-endpoint = <&etf1_out_port>;
> + };
> + };
> +
> + };
> + };
> diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
> index eec37feee8fc..d4b85d9d343e 100644
> --- a/arch/arm64/boot/dts/arm/juno-r1.dts
> +++ b/arch/arm64/boot/dts/arm/juno-r1.dts
> @@ -178,6 +178,7 @@
> };
>
> #include "juno-base.dtsi"
> + #include "juno-cs-r1r2.dtsi"
> };
>
> &memtimer {
> @@ -227,3 +228,11 @@
> &gpu1_thermal_zone {
> status = "okay";
> };
> +
> +&etf0_out_port {
> + remote-endpoint = <&csys2_funnel_in_port0>;
> +};
> +
> +&replicator_in_port0 {
> + remote-endpoint = <&csys2_funnel_out_port>;
> +};
> diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
> index 28f40ec44090..14b29517065c 100644
> --- a/arch/arm64/boot/dts/arm/juno-r2.dts
> +++ b/arch/arm64/boot/dts/arm/juno-r2.dts
> @@ -178,6 +178,7 @@
> };
>
> #include "juno-base.dtsi"
> + #include "juno-cs-r1r2.dtsi"
> };
>
> &memtimer {
> @@ -227,3 +228,11 @@
> &gpu1_thermal_zone {
> status = "okay";
> };
> +
> +&etf0_out_port {
> + remote-endpoint = <&csys2_funnel_in_port0>;
> +};
> +
> +&replicator_in_port0 {
> + remote-endpoint = <&csys2_funnel_out_port>;
> +};
> --
> 2.7.4
>
> _______________________________________________
> CoreSight mailing list
> CoreSight at lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/coresight
next prev parent reply other threads:[~2017-01-12 16:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 15:20 [PATCH v3 0/3] arm64: dts: juno: CoreSight support updates Sudeep Holla
2017-01-12 15:20 ` [PATCH v3 1/3] arm64: dts: juno: refactor CoreSight support on Juno r0 Sudeep Holla
2017-01-12 15:20 ` [PATCH v3 2/3] arm64: dts: juno: fix CoreSight support for Juno r1/r2 variants Sudeep Holla
2017-01-12 16:51 ` Mathieu Poirier [this message]
2017-01-12 17:19 ` Sudeep Holla
2017-01-17 6:58 ` Olof Johansson
2017-01-17 11:37 ` Sudeep Holla
2017-01-17 22:10 ` Olof Johansson
2017-01-12 15:20 ` [PATCH v3 3/3] arm64: dts: juno: add missing CoreSight STM component Sudeep Holla
2017-01-12 17:08 ` [PATCH v3 0/3] arm64: dts: juno: CoreSight support updates Mathieu Poirier
2017-01-12 17:19 ` Sudeep Holla
[not found] ` <CAJ9a7Vha=GiyEcVkzh-N9s7XN8N94KAiM=iY2W4MyLqLWRe-2w@mail.gmail.com>
2017-01-13 11:14 ` Sudeep Holla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANLsYkymGdrM8z-ZWan0Fn+Ymq97oHAJtW3G0YdUAxpWSf+aaw@mail.gmail.com \
--to=mathieu.poirier@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).