Merge branch 'master' of http://git.denx.de/u-boot-sunxi

[u-boot] / arch / arm / dts / zynqmp.dtsi

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index e2f7b53858a3cdb295cbd43706003dd2905d5e59..619450e1ba92c4d55965879b7ab567c0efe0e4f9 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -10,7 +10,7 @@
 / {
        compatible = "xlnx,zynqmp";
        #address-cells = <2>;
-       #size-cells = <1>;
+       #size-cells = <2>;
 
        cpus {
                #address-cells = <1>;
@@ -247,15 +247,15 @@
                compatible = "simple-bus";
                #address-cells = <2>;
                #size-cells = <1>;
-               ranges;
+               ranges = <0 0 0 0 0xffffffff>;
 
                gic: interrupt-controller@f9010000 {
                        compatible = "arm,gic-400", "arm,cortex-a15-gic";
                        #interrupt-cells = <3>;
                        reg = <0x0 0xf9010000 0x10000>,
-                             <0x0 0xf902f000 0x2000>,
+                             <0x0 0xf9020000 0x20000>,
                              <0x0 0xf9040000 0x20000>,
-                             <0x0 0xf906f000 0x2000>;
+                             <0x0 0xf9060000 0x20000>;
                        interrupt-controller;
                        interrupt-parent = <&gic>;
                        interrupts = <1 9 0xf04>;
@@ -264,9 +264,10 @@
 
        amba: amba {
                compatible = "simple-bus";
+               u-boot,dm-pre-reloc;
                #address-cells = <2>;
                #size-cells = <1>;
-               ranges;
+               ranges = <0 0 0 0 0xffffffff>;
 
                can0: can@ff060000 {
                        compatible = "xlnx,zynq-can-1.0";
@@ -674,6 +675,7 @@
                };
 
                sdhci0: sdhci@ff160000 {
+                       u-boot,dm-pre-reloc;
                        compatible = "arasan,sdhci-8.9a";
                        status = "disabled";
                        interrupt-parent = <&gic>;
@@ -685,6 +687,7 @@
                };
 
                sdhci1: sdhci@ff170000 {
+                       u-boot,dm-pre-reloc;
                        compatible = "arasan,sdhci-8.9a";
                        status = "disabled";
                        interrupt-parent = <&gic>;
@@ -776,6 +779,7 @@
                };
 
                uart0: serial@ff000000 {
+                       u-boot,dm-pre-reloc;
                        compatible = "cdns,uart-r1p12", "xlnx,xuartps";
                        status = "disabled";
                        interrupt-parent = <&gic>;
@@ -786,6 +790,7 @@
                };
 
                uart1: serial@ff010000 {
+                       u-boot,dm-pre-reloc;
                        compatible = "cdns,uart-r1p12", "xlnx,xuartps";
                        status = "disabled";
                        interrupt-parent = <&gic>;
@@ -796,23 +801,45 @@
                };
 
                usb0: usb@fe200000 {
-                       compatible = "snps,dwc3";
+                       #address-cells = <2>;
+                       #size-cells = <1>;
                        status = "disabled";
-                       interrupt-parent = <&gic>;
-                       interrupts = <0 65 4>;
-                       reg = <0x0 0xfe200000 0x40000>;
-                       clock-names = "clk_xin", "clk_ahb";
+                       compatible = "xlnx,zynqmp-dwc3";
+                       clock-names = "bus_clk", "ref_clk";
+                       clocks = <&clk125>, <&clk125>;
                        power-domains = <&pd_usb0>;
+                       ranges;
+
+                       dwc3_0: dwc3@fe200000 {
+                               compatible = "snps,dwc3";
+                               status = "disabled";
+                               reg = <0x0 0xfe200000 0x40000>;
+                               interrupt-parent = <&gic>;
+                               interrupts = <0 65 4>;
+                               /* snps,quirk-frame-length-adjustment = <0x20>; */
+                               snps,refclk_fladj;
+                       };
                };
 
                usb1: usb@fe300000 {
-                       compatible = "snps,dwc3";
+                       #address-cells = <2>;
+                       #size-cells = <1>;
                        status = "disabled";
-                       interrupt-parent = <&gic>;
-                       interrupts = <0 70 4>;
-                       reg = <0x0 0xfe300000 0x40000>;
-                       clock-names = "clk_xin", "clk_ahb";
+                       compatible = "xlnx,zynqmp-dwc3";
+                       clock-names = "bus_clk", "ref_clk";
+                       clocks = <&clk125>, <&clk125>;
                        power-domains = <&pd_usb1>;
+                       ranges;
+
+                       dwc3_1: dwc3@fe300000 {
+                               compatible = "snps,dwc3";
+                               status = "disabled";
+                               reg = <0x0 0xfe300000 0x40000>;
+                               interrupt-parent = <&gic>;
+                               interrupts = <0 70 4>;
+                               /* snps,quirk-frame-length-adjustment = <0x20>; */
+                               snps,refclk_fladj;
+                       };
                };
 
                watchdog0: watchdog@fd4d0000 {
@@ -846,7 +873,8 @@
                xlnx_dp: dp@fd4a0000 {
                        compatible = "xlnx,v-dp";
                        status = "disabled";
-                       reg = <0x0 0xfd4a0000 0x1000>;
+                       reg = <0x0 0xfd4a0000 0x1000>,
+                             <0x0 0xfd400000 0x20000>;
                        interrupts = <0 119 4>;
                        interrupt-parent = <&gic>;
                        clock-names = "aclk", "aud_clk";