Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

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

diff --git a/arch/arm/boot/dts/hip04.dtsi b/arch/arm/boot/dts/hip04.dtsi
index bf0cb55809f8f7c07289c33ba58564080aca0adc..4263a9339c2e5899901041acaa2c16a34112e8ce 100644 (file)
--- a/arch/arm/boot/dts/hip04.dtsi
+++ b/arch/arm/boot/dts/hip04.dtsi
@@ -347,7 +347,7 @@
                /* non-configurable replicators don't show up on the
                 * AMBA bus.  As such no need to add "arm,primecell".
                 */
-               compatible = "arm,coresight-replicator";
+               compatible = "arm,coresight-static-replicator";
 
                out-ports {
                        #address-cells = <1>;
@@ -382,7 +382,7 @@
                /* non-configurable replicators don't show up on the
                 * AMBA bus.  As such no need to add "arm,primecell".
                 */
-               compatible = "arm,coresight-replicator";
+               compatible = "arm,coresight-static-replicator";
 
                out-ports {
                        #address-cells = <1>;
@@ -417,7 +417,7 @@
                /* non-configurable replicators don't show up on the
                 * AMBA bus.  As such no need to add "arm,primecell".
                 */
-               compatible = "arm,coresight-replicator";
+               compatible = "arm,coresight-static-replicator";
 
                out-ports {
                        #address-cells = <1>;
@@ -451,7 +451,7 @@
                /* non-configurable replicators don't show up on the
                 * AMBA bus.  As such no need to add "arm,primecell".
                 */
-               compatible = "arm,coresight-replicator";
+               compatible = "arm,coresight-static-replicator";
 
                out-ports {
                        #address-cells = <1>;
@@ -482,7 +482,7 @@
        };
 
        funnel@0,e3c41000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3c41000 0 0x1000>;
 
                clocks = <&clk_375m>;
@@ -531,7 +531,7 @@
        };
 
        funnel@0,e3c81000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3c81000 0 0x1000>;
 
                clocks = <&clk_375m>;
@@ -580,7 +580,7 @@
        };
 
        funnel@0,e3cc1000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3cc1000 0 0x1000>;
 
                clocks = <&clk_375m>;
@@ -629,7 +629,7 @@
        };
 
        funnel@0,e3d01000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3d01000 0 0x1000>;
 
                clocks = <&clk_375m>;
@@ -678,7 +678,7 @@
        };
 
        funnel@0,e3c04000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3c04000 0 0x1000>;
 
                clocks = <&clk_375m>;