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

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / xilinx / zynqmp.dtsi

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index 3ec99f13c259e34fc6180d430f3cd52abbcb772d..771f60e0346d0941f8d2d4f9515ccd5b0a9fa3a5 100644 (file)
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -131,7 +131,6 @@
                        };
 
                        zynqmp_clk: clock-controller {
                        };
 
                        zynqmp_clk: clock-controller {

-                               u-boot,dm-pre-reloc;

                                #clock-cells = <1>;
                                compatible = "xlnx,zynqmp-clk";
                                clocks = <&pss_ref_clk>,
                                #clock-cells = <1>;
                                compatible = "xlnx,zynqmp-clk";
                                clocks = <&pss_ref_clk>,


@@ -183,7 +182,7 @@
                ranges;
        };
 
                ranges;
        };
 

-       amba_apu: amba-apu@0 {
+       amba_apu: axi@0 {

                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <1>;
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <1>;


@@ -202,7 +201,7 @@
                };
        };
 
                };
        };
 

-       amba: amba {
+       amba: axi {

                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <2>;
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <2>;


@@ -501,7 +500,7 @@
                };
 
                i2c0: i2c@ff020000 {
                };
 
                i2c0: i2c@ff020000 {

-                       compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
+                       compatible = "cdns,i2c-r1p14";

                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 17 4>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 17 4>;


@@ -512,7 +511,7 @@
                };
 
                i2c1: i2c@ff030000 {
                };
 
                i2c1: i2c@ff030000 {

-                       compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10";
+                       compatible = "cdns,i2c-r1p14";

                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 18 4>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 18 4>;