]> git.ipfire.org Git - people/ms/u-boot.git/blobdiff - arch/arm/dts/zynqmp.dtsi
ARM64: zynqmp: Remove DTC 1.4.2 warnings
[people/ms/u-boot.git] / arch / arm / dts / zynqmp.dtsi
index 45209309c054bd0bc7b883d1c9e1656970bd5d74..ac17c4723a13a4827b2131b93e28963864d93647 100644 (file)
@@ -10,7 +10,7 @@
 / {
        compatible = "xlnx,zynqmp";
        #address-cells = <2>;
-       #size-cells = <1>;
+       #size-cells = <2>;
 
        cpus {
                #address-cells = <1>;
                             <1 10 0xf01>;
        };
 
-       amba_apu: amba_apu {
+       amba_apu: amba_apu@0 {
                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>;
                };
        };
 
-       amba: amba {
+       amba: amba@0 {
                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";
                        power-domains = <&pd_adma>;
                };
 
+               mc: memory-controller@fd070000 {
+                       compatible = "xlnx,zynqmp-ddrc-2.40a";
+                       reg = <0x0 0xfd070000 0x30000>;
+                       interrupt-parent = <&gic>;
+                       interrupts = <0 112 4>;
+               };
+
                nand0: nand@ff100000 {
                        compatible = "arasan,nfc-v3p10";
                        status = "disabled";
                        compatible = "xlnx,zynqmp-gpio-1.0";
                        status = "disabled";
                        #gpio-cells = <0x2>;
+                       #interrupt-cells = <2>;
+                       interrupt-controller;
                        interrupt-parent = <&gic>;
                        interrupts = <0 16 4>;
                        reg = <0x0 0xff0a0000 0x1000>;
                        #interrupt-cells = <1>;
                        device_type = "pci";
                        interrupt-parent = <&gic>;
-                       interrupts = < 0 118 4>,
-                                    < 0 116 4>,
-                                    < 0 115 4>,        /* MSI_1 [63...32] */
-                                    < 0 114 4 >;       /* MSI_0 [31...0] */
+                       interrupts = <0 118 4>,
+                                    <0 116 4>,
+                                    <0 115 4>, /* MSI_1 [63...32] */
+                                    <0 114 4>; /* MSI_0 [31...0] */
                        interrupt-names = "misc", "intx", "msi_1", "msi_0";
                        reg = <0x0 0xfd0e0000 0x1000>,
                              <0x0 0xfd480000 0x1000>,
                              <0x0 0xe0000000 0x1000000>;
                        reg-names = "breg", "pcireg", "cfg";
                        ranges = <0x02000000 0x00000000 0xe1000000 0x00000000 0xe1000000 0 0x0f000000>;
+                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
+                       interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc 0x1>,
+                                       <0x0 0x0 0x0 0x2 &pcie_intc 0x2>,
+                                       <0x0 0x0 0x0 0x3 &pcie_intc 0x3>,
+                                       <0x0 0x0 0x0 0x4 &pcie_intc 0x4>;
+                       pcie_intc: legacy-interrupt-controller {
+                               interrupt-controller;
+                               #address-cells = <0>;
+                               #interrupt-cells = <1>;
+                       };
                };
 
                qspi: spi@ff0f0000 {
                        interrupts = <0 15 4>;
                        interrupt-parent = <&gic>;
                        num-cs = <1>;
-                       reg = <0x0 0xff0f0000 0x1000 0x0 0xc0000000 0x8000000>;
+                       reg = <0x0 0xff0f0000 0x1000>,
+                             <0x0 0xc0000000 0x8000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        power-domains = <&pd_qspi>;
                };
 
                sdhci0: sdhci@ff160000 {
+                       u-boot,dm-pre-reloc;
                        compatible = "arasan,sdhci-8.9a";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                };
 
                sdhci1: sdhci@ff170000 {
+                       u-boot,dm-pre-reloc;
                        compatible = "arasan,sdhci-8.9a";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                };
 
                uart0: serial@ff000000 {
-                       compatible = "cdns,uart-r1p12";
+                       u-boot,dm-pre-reloc;
+                       compatible = "cdns,uart-r1p12", "xlnx,xuartps";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 21 4>;
                };
 
                uart1: serial@ff010000 {
-                       compatible = "cdns,uart-r1p12";
+                       u-boot,dm-pre-reloc;
+                       compatible = "cdns,uart-r1p12", "xlnx,xuartps";
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 22 4>;
                        power-domains = <&pd_uart1>;
                };
 
-               usb0: usb@fe200000 {
-                       compatible = "snps,dwc3";
+               usb0: usb0 {
+                       #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";
+               usb1: usb1 {
+                       #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 {
                        };
                };
 
-               xlnx_dp: dp@43c00000 {
+               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";
                        xlnx,bpc = <8>;
                        xlnx,audio-chan = <2>;
                        xlnx,dp-sub = <&xlnx_dp_sub>;
+                       xlnx,max-pclock-frequency = <300000>;
                };
 
                xlnx_dp_snd_card: dp_snd_card {
                        dma-names = "tx";
                };
 
-               xlnx_dp_sub: dp_sub@43c0a000 {
+               xlnx_dp_sub: dp_sub@fd4aa000 {
                        compatible = "xlnx,dp-sub";
                        status = "disabled";
-                       reg = <0x0 0xfd4aa000 0x1000>, <0x0 0xfd4ab000 0x1000>, <0x0 0xfd4ac000 0x1000>;
+                       reg = <0x0 0xfd4aa000 0x1000>,
+                             <0x0 0xfd4ab000 0x1000>,
+                             <0x0 0xfd4ac000 0x1000>;
                        reg-names = "blend", "av_buf", "aud";
                        xlnx,output-fmt = "rgb";
+                       xlnx,vid-fmt = "yuyv";
+                       xlnx,gfx-fmt = "rgb565";
                };
 
                xlnx_dpdma: dma@fd4c0000 {
                        clock-names = "axi_clk";
                        dma-channels = <6>;
                        #dma-cells = <1>;
-                       dma-video0channel@43c10000 {
+                       dma-video0channel {
                                compatible = "xlnx,video0";
                        };
-                       dma-video1channel@43c10000 {
+                       dma-video1channel {
                                compatible = "xlnx,video1";
                        };
-                       dma-video2channel@43c10000 {
+                       dma-video2channel {
                                compatible = "xlnx,video2";
                        };
-                       dma-graphicschannel@43c10000 {
+                       dma-graphicschannel {
                                compatible = "xlnx,graphics";
                        };
-                       dma-audio0channel@43c10000 {
+                       dma-audio0channel {
                                compatible = "xlnx,audio0";
                        };
-                       dma-audio1channel@43c10000 {
+                       dma-audio1channel {
                                compatible = "xlnx,audio1";
                        };
                };