arm64: dts: juno: add missing CoreSight STM component
authorMike Leach <mike.leach@linaro.org>
Wed, 11 Jan 2017 20:44:09 +0000 (20:44 +0000)
committerSudeep Holla <sudeep.holla@arm.com>
Wed, 18 Jan 2017 11:14:41 +0000 (11:14 +0000)
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>
arch/arm64/boot/dts/arm/juno-base.dtsi
arch/arm64/boot/dts/arm/juno-r1.dts
arch/arm64/boot/dts/arm/juno-r2.dts
arch/arm64/boot/dts/arm/juno.dts

index 66907430a70ab8d64e657c254b45f9be72f82971..d410b9705dd629967819b5a73a5e756569161aa1 100644 (file)
                };
        };
 
+       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>;
index aef138aa5765ea0e2f823d517653d42ac9ae40e9..0033c59a64b585ac20321f90abcbcccfef88a451 100644 (file)
 &replicator_in_port0 {
        remote-endpoint = <&csys2_funnel_out_port>;
 };
+
+&stm_out_port {
+       remote-endpoint = <&csys1_funnel_in_port0>;
+};
index 827da7c92607ef4735c9d896b2b6a59c70bab112..218d0e4736a86784e5d159ef6d1d4fd4e07f89fa 100644 (file)
 &replicator_in_port0 {
        remote-endpoint = <&csys2_funnel_out_port>;
 };
+
+&stm_out_port {
+       remote-endpoint = <&csys1_funnel_in_port0>;
+};
index 66fa4388d1811150d7b286e24393d41f6b39748e..bb2820ef3d5b04a40091fc0777d9a5a3bee5bf28 100644 (file)
 &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>;
+                       };
+               };
+       };
+};