Commit cdc07e96 authored by Mike Leach's avatar Mike Leach Committed by Sudeep Holla
Browse files

arm64: dts: juno: add CoreSight support for Juno r1/r2 variants 



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.

Reviewed-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMike Leach <mike.leach@linaro.org>
[sudeep.holla@arm.com: minor changelog update and major reorganisation of
	the common coresight components back into juno-base.dtsi to avoid
	duplication, also renamed funnel node names]
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 19ac17c0

arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi

0 → 100644
+100 −0
Original line number Diff line number Diff line 
/ {

	funnel@20130000 { /* cssys1 */

		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>;



			/* output port */

			port@0 {

				reg = <0>;

				csys1_funnel_out_port: endpoint {

					remote-endpoint = <&etf1_in_port>;

				};

			};



			/* input port */

			port@1 {

				reg = <0>;

				csys1_funnel_in_port0: endpoint {

					slave-mode;

				};

			};



		};

	};



	etf@20140000 { /* etf1 */

		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@0 {

				reg = <0>;

				etf1_in_port: endpoint {

					slave-mode;

					remote-endpoint = <&csys1_funnel_out_port>;

				};

			};



			/* output port */

			port@1 {

				reg = <0>;

				etf1_out_port: endpoint {

					remote-endpoint = <&csys2_funnel_in_port1>;

				};

			};

		};

	};



	funnel@20150000 { /* cssys2 */

		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@0 {

				reg = <0>;

				csys2_funnel_out_port: endpoint {

					remote-endpoint = <&replicator_in_port0>;

				};

			};



			/* input ports */

			port@1 {

				reg = <0>;

				csys2_funnel_in_port0: endpoint {

					slave-mode;

					remote-endpoint = <&etf0_out_port>;

				};

			};



			port@2 {

				reg = <1>;

				csys2_funnel_in_port1: endpoint {

					slave-mode;

					remote-endpoint = <&etf1_out_port>;

				};

			};



		};

	};

};

arch/arm64/boot/dts/arm/juno-r1.dts

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "juno-base.dtsi"

#include "juno-cs-r1r2.dtsi"



/ {

	model = "ARM Juno development board (r1)";
@@ -226,3 +227,11 @@ 
&gpu1_thermal_zone {

	status = "okay";

};



&etf0_out_port {

	remote-endpoint = <&csys2_funnel_in_port0>;

};



&replicator_in_port0 {

	remote-endpoint = <&csys2_funnel_out_port>;

};

arch/arm64/boot/dts/arm/juno-r2.dts

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "juno-base.dtsi"

#include "juno-cs-r1r2.dtsi"



/ {

	model = "ARM Juno development board (r2)";
@@ -226,3 +227,11 @@ 
&gpu1_thermal_zone {

	status = "okay";

};



&etf0_out_port {

	remote-endpoint = <&csys2_funnel_in_port0>;

};



&replicator_in_port0 {

	remote-endpoint = <&csys2_funnel_out_port>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE