4 files changed, 39 insertions, 0 deletions

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 66907430a70a..d410b9705dd6 100644
--- 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 aef138aa5765..0033c59a64b5 100644
--- 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 827da7c92607..218d0e4736a8 100644
--- 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 66fa4388d181..bb2820ef3d5b 100644
--- 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>;
+                        };
+                };
+        };
+};