Merge airlied/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / arch / arm / boot / dts / qcom-msm8974.dtsi

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index c5ee68a..a392076 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -779,7 +779,7 @@
                };
 
                replicator@fc31c000 {
-                       compatible = "qcom,coresight-replicator1x", "arm,primecell";
+                       compatible = "arm,coresight-dynamic-replicator", "arm,primecell";
                        reg = <0xfc31c000 0x1000>;
 
                        clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;