/* 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>;
                /* 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>;
                /* 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>;
                /* 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>;
        };
 
        funnel@0,e3c41000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3c41000 0 0x1000>;
 
                clocks = <&clk_375m>;
        };
 
        funnel@0,e3c81000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3c81000 0 0x1000>;
 
                clocks = <&clk_375m>;
        };
 
        funnel@0,e3cc1000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3cc1000 0 0x1000>;
 
                clocks = <&clk_375m>;
        };
 
        funnel@0,e3d01000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3d01000 0 0x1000>;
 
                clocks = <&clk_375m>;
        };
 
        funnel@0,e3c04000 {
-               compatible = "arm,coresight-funnel", "arm,primecell";
+               compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
                reg = <0 0xe3c04000 0 0x1000>;
 
                clocks = <&clk_375m>;