Merge tag 'juno-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep...

Merge "ARMv8 Juno DT fix for v4.11" from Sudeep Holla:

Just single patch to fix replicator in order to prevent overflows at
the source and reduce the back pressure by splitting the trace output
to TPIU and ETR.

* tag 'juno-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno: update definition for programmable replicator

diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index 9d799d938d2f6b1b56c81cdf4ba8731e3ca47dc4..df539e865b903cc0ecc9870573bf5b57d5198b25 100644 (file)
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -372,12 +372,13 @@
                };
        };
 
-       coresight-replicator {
-               /*
-                * Non-configurable replicators don't show up on the
-                * AMBA bus.  As such no need to add "arm,primecell".
-                */
-               compatible = "arm,coresight-replicator";
+       replicator@20120000 {
+               compatible = "qcom,coresight-replicator1x", "arm,primecell";
+               reg = <0 0x20120000 0 0x1000>;
+
+               clocks = <&soc_smc50mhz>;
+               clock-names = "apb_pclk";
+               power-domains = <&scpi_devpd 0>;
 
                ports {
                        #address-cells = <1>;