ARM: dts: qcom: apq8064: move replicator out of soc node
authorDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tue, 18 Mar 2025 13:22:03 +0000 (15:22 +0200)
committerBjorn Andersson <andersson@kernel.org>
Tue, 13 May 2025 16:00:59 +0000 (17:00 +0100)
The CoreSight static replicator device isn't a part of the system MMIO
bus, as such it should not be a part of the soc node. Follow the example
of other platforms and move it out of the soc bus to the top-level (and
reoder ports to follow alphabetic order).

Fixes: 7a5c275fd821 ("ARM: dts: qcom: Add apq8064 CoreSight components")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250318-fix-nexus-4-v2-10-bcedd1406790@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
arch/arm/boot/dts/qcom/qcom-apq8064.dtsi

index b6533630e347c8fc5e3f0791778cd05760b3f3c8..b02e6739ccb20a287095d8c3e212040e4ac50fdd 100644 (file)
                };
        };
 
+       replicator {
+               compatible = "arm,coresight-static-replicator";
+
+               clocks = <&rpmcc RPM_QDSS_CLK>;
+               clock-names = "apb_pclk";
+
+               in-ports {
+                       port {
+                               replicator_in: endpoint {
+                                       remote-endpoint = <&funnel_out>;
+                               };
+                       };
+               };
+
+               out-ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+                               replicator_out0: endpoint {
+                                       remote-endpoint = <&etb_in>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+                               replicator_out1: endpoint {
+                                       remote-endpoint = <&tpiu_in>;
+                               };
+                       };
+               };
+       };
+
        soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
                        };
                };
 
-               replicator {
-                       compatible = "arm,coresight-static-replicator";
-
-                       clocks = <&rpmcc RPM_QDSS_CLK>;
-                       clock-names = "apb_pclk";
-
-                       out-ports {
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               port@0 {
-                                       reg = <0>;
-                                       replicator_out0: endpoint {
-                                               remote-endpoint = <&etb_in>;
-                                       };
-                               };
-                               port@1 {
-                                       reg = <1>;
-                                       replicator_out1: endpoint {
-                                               remote-endpoint = <&tpiu_in>;
-                                       };
-                               };
-                       };
-
-                       in-ports {
-                               port {
-                                       replicator_in: endpoint {
-                                               remote-endpoint = <&funnel_out>;
-                                       };
-                               };
-                       };
-               };
-
                funnel@1a04000 {
                        compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x1a04000 0x1000>;