ARM64: zynqmp: Use 64bit size cell format for main amba bus
authorMichal Simek <michal.simek@xilinx.com>
Thu, 11 Feb 2016 06:19:06 +0000 (07:19 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 15 Nov 2016 14:30:40 +0000 (15:30 +0100)
Use 64bit size cell for main amba bus instead of 32bit because PCIe
node requires it Change 64bit sizes also for all others IPs.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
arch/arm/dts/zynqmp.dtsi

index 49791d34df329ac58f68ffb999884a95e4023bbe..f67238e89725b73d1cc7e4d982cb178a44970356 100644 (file)
                };
        };
 
-       amba: amba@0 {
+       amba: amba {
                compatible = "simple-bus";
                u-boot,dm-pre-reloc;
                #address-cells = <2>;
-               #size-cells = <1>;
-               ranges = <0 0 0 0 0xffffffff>;
+               #size-cells = <2>;
+               ranges;
 
                can0: can@ff060000 {
                        compatible = "xlnx,zynq-can-1.0";
                        status = "disabled";
                        clock-names = "can_clk", "pclk";
-                       reg = <0x0 0xff060000 0x1000>;
+                       reg = <0x0 0xff060000 0x0 0x1000>;
                        interrupts = <0 23 4>;
                        interrupt-parent = <&gic>;
                        tx-fifo-depth = <0x40>;
                        compatible = "xlnx,zynq-can-1.0";
                        status = "disabled";
                        clock-names = "can_clk", "pclk";
-                       reg = <0x0 0xff070000 0x1000>;
+                       reg = <0x0 0xff070000 0x0 0x1000>;
                        interrupts = <0 24 4>;
                        interrupt-parent = <&gic>;
                        tx-fifo-depth = <0x40>;
 
                cci: cci@fd6e0000 {
                        compatible = "arm,cci-400";
-                       reg = <0x0 0xfd6e0000 0x9000>;
+                       reg = <0x0 0xfd6e0000 0x0 0x9000>;
                        ranges = <0x0 0x0 0xfd6e0000 0x10000>;
                        #address-cells = <1>;
                        #size-cells = <1>;
                fpd_dma_chan1: dma@fd500000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd500000 0x1000>;
+                       reg = <0x0 0xfd500000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 124 4>;
                        clock-names = "clk_main", "clk_apb";
                fpd_dma_chan2: dma@fd510000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd510000 0x1000>;
+                       reg = <0x0 0xfd510000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 125 4>;
                        clock-names = "clk_main", "clk_apb";
                fpd_dma_chan3: dma@fd520000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd520000 0x1000>;
+                       reg = <0x0 0xfd520000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 126 4>;
                        clock-names = "clk_main", "clk_apb";
                fpd_dma_chan4: dma@fd530000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd530000 0x1000>;
+                       reg = <0x0 0xfd530000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 127 4>;
                        clock-names = "clk_main", "clk_apb";
                fpd_dma_chan5: dma@fd540000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd540000 0x1000>;
+                       reg = <0x0 0xfd540000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 128 4>;
                        clock-names = "clk_main", "clk_apb";
                fpd_dma_chan6: dma@fd550000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd550000 0x1000>;
+                       reg = <0x0 0xfd550000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 129 4>;
                        clock-names = "clk_main", "clk_apb";
                fpd_dma_chan7: dma@fd560000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd560000 0x1000>;
+                       reg = <0x0 0xfd560000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 130 4>;
                        clock-names = "clk_main", "clk_apb";
                fpd_dma_chan8: dma@fd570000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xfd570000 0x1000>;
+                       reg = <0x0 0xfd570000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 131 4>;
                        clock-names = "clk_main", "clk_apb";
                gpu: gpu@fd4b0000 {
                        status = "disabled";
                        compatible = "arm,mali-400", "arm,mali-utgard";
-                       reg = <0x0 0xfd4b0000 0x30000>;
+                       reg = <0x0 0xfd4b0000 0x0 0x30000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>;
                        interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1";
                lpd_dma_chan1: dma@ffa80000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffa80000 0x1000>;
+                       reg = <0x0 0xffa80000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 77 4>;
                        xlnx,bus-width = <64>;
                lpd_dma_chan2: dma@ffa90000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffa90000 0x1000>;
+                       reg = <0x0 0xffa90000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 78 4>;
                        xlnx,bus-width = <64>;
                lpd_dma_chan3: dma@ffaa0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffaa0000 0x1000>;
+                       reg = <0x0 0xffaa0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 79 4>;
                        xlnx,bus-width = <64>;
                lpd_dma_chan4: dma@ffab0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffab0000 0x1000>;
+                       reg = <0x0 0xffab0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 80 4>;
                        xlnx,bus-width = <64>;
                lpd_dma_chan5: dma@ffac0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffac0000 0x1000>;
+                       reg = <0x0 0xffac0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 81 4>;
                        xlnx,bus-width = <64>;
                lpd_dma_chan6: dma@ffad0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffad0000 0x1000>;
+                       reg = <0x0 0xffad0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 82 4>;
                        xlnx,bus-width = <64>;
                lpd_dma_chan7: dma@ffae0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffae0000 0x1000>;
+                       reg = <0x0 0xffae0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 83 4>;
                        xlnx,bus-width = <64>;
                lpd_dma_chan8: dma@ffaf0000 {
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dma-1.0";
-                       reg = <0x0 0xffaf0000 0x1000>;
+                       reg = <0x0 0xffaf0000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 84 4>;
                        xlnx,bus-width = <64>;
 
                mc: memory-controller@fd070000 {
                        compatible = "xlnx,zynqmp-ddrc-2.40a";
-                       reg = <0x0 0xfd070000 0x30000>;
+                       reg = <0x0 0xfd070000 0x0 0x30000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 112 4>;
                };
                nand0: nand@ff100000 {
                        compatible = "arasan,nfc-v3p10";
                        status = "disabled";
-                       reg = <0x0 0xff100000 0x1000>;
+                       reg = <0x0 0xff100000 0x0 0x1000>;
                        clock-names = "clk_sys", "clk_flash";
                        interrupt-parent = <&gic>;
                        interrupts = <0 14 4>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 57 4>, <0 57 4>;
-                       reg = <0x0 0xff0b0000 0x1000>;
+                       reg = <0x0 0xff0b0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 59 4>, <0 59 4>;
-                       reg = <0x0 0xff0c0000 0x1000>;
+                       reg = <0x0 0xff0c0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 61 4>, <0 61 4>;
-                       reg = <0x0 0xff0d0000 0x1000>;
+                       reg = <0x0 0xff0d0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 63 4>, <0 63 4>;
-                       reg = <0x0 0xff0e0000 0x1000>;
+                       reg = <0x0 0xff0e0000 0x0 0x1000>;
                        clock-names = "pclk", "hclk", "tx_clk";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        interrupts = <0 16 4>;
                        interrupt-controller;
                        #interrupt-cells = <2>;
-                       reg = <0x0 0xff0a0000 0x1000>;
+                       reg = <0x0 0xff0a0000 0x0 0x1000>;
                        power-domains = <&pd_gpio>;
                };
 
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 17 4>;
-                       reg = <0x0 0xff020000 0x1000>;
+                       reg = <0x0 0xff020000 0x0 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        power-domains = <&pd_i2c0>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 18 4>;
-                       reg = <0x0 0xff030000 0x1000>;
+                       reg = <0x0 0xff030000 0x0 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        power-domains = <&pd_i2c1>;
 
                ocm: memory-controller@ff960000 {
                        compatible = "xlnx,zynqmp-ocmc-1.0";
-                       reg = <0x0 0xff960000 0x1000>;
+                       reg = <0x0 0xff960000 0x0 0x1000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 10 4>;
                };
                                     <0 114 4>; /* MSI_0 [31...0] */
                        interrupt-names = "misc","dummy","intx", "msi1", "msi0";
                        msi-parent = <&pcie>;
-                       reg = <0x0 0xfd0e0000 0x1000>,
-                             <0x0 0xfd480000 0x1000>,
-                             <0x0 0xe0000000 0x1000000>;
+                       reg = <0x0 0xfd0e0000 0x0 0x1000>,
+                             <0x0 0xfd480000 0x0 0x1000>,
+                             <0x0 0xe0000000 0x0 0x1000000>;
                        reg-names = "breg", "pcireg", "cfg";
                        ranges = <0x02000000 0x00000000 0xe1000000 0x00000000 0xe1000000 0 0x0f000000>;
                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                        interrupts = <0 15 4>;
                        interrupt-parent = <&gic>;
                        num-cs = <1>;
-                       reg = <0x0 0xff0f0000 0x1000>,
-                             <0x0 0xc0000000 0x8000000>;
+                       reg = <0x0 0xff0f0000 0x0 0x1000>,
+                             <0x0 0xc0000000 0x0 0x8000000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        #stream-id-cells = <1>;
                rtc: rtc@ffa60000 {
                        compatible = "xlnx,zynqmp-rtc";
                        status = "disabled";
-                       reg = <0x0 0xffa60000 0x100>;
+                       reg = <0x0 0xffa60000 0x0 0x100>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 26 4>, <0 27 4>;
                        interrupt-names = "alarm", "sec";
                serdes: zynqmp_phy@fd400000 {
                        compatible = "xlnx,zynqmp-psgtr";
                        status = "disabled";
-                       reg = <0x0 0xfd400000 0x40000>,
-                             <0x0 0xfd3d0000 0x1000>,
-                             <0x0 0xfd1a0000 0x1000>,
-                             <0x0 0xff5e0000 0x1000>;
+                       reg = <0x0 0xfd400000 0x0 0x40000>,
+                             <0x0 0xfd3d0000 0x0 0x1000>,
+                             <0x0 0xfd1a0000 0x0 0x1000>,
+                             <0x0 0xff5e0000 0x0 0x1000>;
                        reg-names = "serdes", "siou", "fpd", "lpd";
                        xlnx,tx_termination_fix;
                        lane0: lane0 {
                sata: ahci@fd0c0000 {
                        compatible = "ceva,ahci-1v84";
                        status = "disabled";
-                       reg = <0x0 0xfd0c0000 0x2000>;
+                       reg = <0x0 0xfd0c0000 0x0 0x2000>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 133 4>;
                        power-domains = <&pd_sata>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 48 4>;
-                       reg = <0x0 0xff160000 0x1000>;
+                       reg = <0x0 0xff160000 0x0 0x1000>;
                        clock-names = "clk_xin", "clk_ahb";
                        xlnx,device_id = <0>;
                        #stream-id-cells = <1>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 49 4>;
-                       reg = <0x0 0xff170000 0x1000>;
+                       reg = <0x0 0xff170000 0x0 0x1000>;
                        clock-names = "clk_xin", "clk_ahb";
                        xlnx,device_id = <1>;
                        #stream-id-cells = <1>;
 
                smmu: smmu@fd800000 {
                        compatible = "arm,mmu-500";
-                       reg = <0x0 0xfd800000 0x20000>;
+                       reg = <0x0 0xfd800000 0x0 0x20000>;
                        #iommu-cells = <1>;
                        #global-interrupts = <1>;
                        interrupt-parent = <&gic>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 19 4>;
-                       reg = <0x0 0xff040000 0x1000>;
+                       reg = <0x0 0xff040000 0x0 0x1000>;
                        clock-names = "ref_clk", "pclk";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 20 4>;
-                       reg = <0x0 0xff050000 0x1000>;
+                       reg = <0x0 0xff050000 0x0 0x1000>;
                        clock-names = "ref_clk", "pclk";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 36 4>, <0 37 4>, <0 38 4>;
-                       reg = <0x0 0xff110000 0x1000>;
+                       reg = <0x0 0xff110000 0x0 0x1000>;
                        timer-width = <32>;
                        power-domains = <&pd_ttc0>;
                };
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 39 4>, <0 40 4>, <0 41 4>;
-                       reg = <0x0 0xff120000 0x1000>;
+                       reg = <0x0 0xff120000 0x0 0x1000>;
                        timer-width = <32>;
                        power-domains = <&pd_ttc1>;
                };
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 42 4>, <0 43 4>, <0 44 4>;
-                       reg = <0x0 0xff130000 0x1000>;
+                       reg = <0x0 0xff130000 0x0 0x1000>;
                        timer-width = <32>;
                        power-domains = <&pd_ttc2>;
                };
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 45 4>, <0 46 4>, <0 47 4>;
-                       reg = <0x0 0xff140000 0x1000>;
+                       reg = <0x0 0xff140000 0x0 0x1000>;
                        timer-width = <32>;
                        power-domains = <&pd_ttc3>;
                };
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 21 4>;
-                       reg = <0x0 0xff000000 0x1000>;
+                       reg = <0x0 0xff000000 0x0 0x1000>;
                        clock-names = "uart_clk", "pclk";
                        power-domains = <&pd_uart0>;
                };
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 22 4>;
-                       reg = <0x0 0xff010000 0x1000>;
+                       reg = <0x0 0xff010000 0x0 0x1000>;
                        clock-names = "uart_clk", "pclk";
                        power-domains = <&pd_uart1>;
                };
 
                usb0: usb0 {
                        #address-cells = <2>;
-                       #size-cells = <1>;
+                       #size-cells = <2>;
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dwc3";
                        clock-names = "bus_clk", "ref_clk";
                        dwc3_0: dwc3@fe200000 {
                                compatible = "snps,dwc3";
                                status = "disabled";
-                               reg = <0x0 0xfe200000 0x40000>;
+                               reg = <0x0 0xfe200000 0x0 0x40000>;
                                interrupt-parent = <&gic>;
                                interrupts = <0 65 4>;
                                /* snps,quirk-frame-length-adjustment = <0x20>; */
 
                usb1: usb1 {
                        #address-cells = <2>;
-                       #size-cells = <1>;
+                       #size-cells = <2>;
                        status = "disabled";
                        compatible = "xlnx,zynqmp-dwc3";
                        clock-names = "bus_clk", "ref_clk";
                        dwc3_1: dwc3@fe300000 {
                                compatible = "snps,dwc3";
                                status = "disabled";
-                               reg = <0x0 0xfe300000 0x40000>;
+                               reg = <0x0 0xfe300000 0x0 0x40000>;
                                interrupt-parent = <&gic>;
                                interrupts = <0 70 4>;
                                /* snps,quirk-frame-length-adjustment = <0x20>; */
                        status = "disabled";
                        interrupt-parent = <&gic>;
                        interrupts = <0 113 1>;
-                       reg = <0x0 0xfd4d0000 0x1000>;
+                       reg = <0x0 0xfd4d0000 0x0 0x1000>;
                        timeout-sec = <10>;
                };
 
                xlnx_dp: dp@fd4a0000 {
                        compatible = "xlnx,v-dp";
                        status = "disabled";
-                       reg = <0x0 0xfd4a0000 0x1000>;
+                       reg = <0x0 0xfd4a0000 0x0 0x1000>;
                        interrupts = <0 119 4>;
                        interrupt-parent = <&gic>;
                        clock-names = "aclk", "aud_clk";
                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 0x0 0x1000>,
+                             <0x0 0xfd4ab000 0x0 0x1000>,
+                             <0x0 0xfd4ac000 0x0 0x1000>;
                        reg-names = "blend", "av_buf", "aud";
                        xlnx,output-fmt = "rgb";
                        xlnx,vid-fmt = "yuyv";
                xlnx_dpdma: dma@fd4c0000 {
                        compatible = "xlnx,dpdma";
                        status = "disabled";
-                       reg = <0x0 0xfd4c0000 0x1000>;
+                       reg = <0x0 0xfd4c0000 0x0 0x1000>;
                        interrupts = <0 122 4>;
                        interrupt-parent = <&gic>;
                        clock-names = "axi_clk";