arm64: dts: juno: add missing CoreSight STM component

This patch adds the missing CoreSight STM component definition to the
device tree of all the juno variants(r0,r1,r2)

STM component is connected to different funnels depending on Juno
platform variant.

Reviewed-and-tested-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mike Leach <mike.leach@linaro.org>
[sudeep.holla@arm.com: minor changelog update and reorganising the STM
	node back into juno-base.dtsi to avoid duplication]
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 6690743..d410b97 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -185,6 +185,21 @@
                };
        };
 
+       stm@20100000 {
+               compatible = "arm,coresight-stm", "arm,primecell";
+               reg = <0 0x20100000 0 0x1000>,
+                     <0 0x28000000 0 0x1000000>;
+               reg-names = "stm-base", "stm-stimulus-base";
+
+               clocks = <&soc_smc50mhz>;
+               clock-names = "apb_pclk";
+               power-domains = <&scpi_devpd 0>;
+               port {
+                       stm_out_port: endpoint {
+                       };
+               };
+       };
+
        etm0: etm@22040000 {
                compatible = "arm,coresight-etm4x", "arm,primecell";
                reg = <0 0x22040000 0 0x1000>;

diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r1.dts
index aef138a..0033c59 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r1.dts
+++ b/arch/arm64/boot/dts/arm/juno-r1.dts
@@ -235,3 +235,7 @@
 &replicator_in_port0 {
        remote-endpoint = <&csys2_funnel_out_port>;
 };
+
+&stm_out_port {
+       remote-endpoint = <&csys1_funnel_in_port0>;
+};

diff --git a/arch/arm64/boot/dts/arm/juno-r2.dts b/arch/arm64/boot/dts/arm/juno-r2.dts
index 827da7c..218d0e4 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-r2.dts
+++ b/arch/arm64/boot/dts/arm/juno-r2.dts
@@ -235,3 +235,7 @@
 &replicator_in_port0 {
        remote-endpoint = <&csys2_funnel_out_port>;
 };
+
+&stm_out_port {
+       remote-endpoint = <&csys1_funnel_in_port0>;
+};

diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index 66fa438..bb2820e 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -210,3 +210,19 @@
 &replicator_in_port0 {
        remote-endpoint = <&etf0_out_port>;
 };
+
+&stm_out_port {
+       remote-endpoint = <&main_funnel_in_port2>;
+};
+
+&main_funnel {
+       ports {
+               port@3 {
+                       reg = <2>;
+                       main_funnel_in_port2: endpoint {
+                               slave-mode;
+                               remote-endpoint = <&stm_out_port>;
+                       };
+               };
+       };
+};