Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / qcom-apq8064.dtsi

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 65975df6a8c34d7e3ffef2c1b2e3452b026e9c7c..8b79b4112ee1a92a00b910109a58907e70ae8648 100644 (file)
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1603,7 +1603,7 @@
                };
 
                replicator {
-                       compatible = "arm,coresight-replicator";
+                       compatible = "arm,coresight-static-replicator";
 
                        clocks = <&rpmcc RPM_QDSS_CLK>;
                        clock-names = "apb_pclk";
@@ -1636,7 +1636,7 @@
                };
 
                funnel@1a04000 {
-                       compatible = "arm,coresight-funnel", "arm,primecell";
+                       compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                        reg = <0x1a04000 0x1000>;
 
                        clocks = <&rpmcc RPM_QDSS_CLK>;