arm64: zynqmp: Remove tx_termination_fix detection on silicon v1

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

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index 1be4d2c680011009ef7eb7608f2a8e9c4e4d037e..e80c74b09263a2a6dbe094a33c93beffb03f6c9a 100644 (file)
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -167,7 +167,6 @@
                };
 
                pd_dp: pd-dp {
-                       /* fixme: what to attach to */
                        #power-domain-cells = <0x0>;
                        pd-id = <0x29>;
                };
@@ -289,6 +288,16 @@
                #size-cells = <2>;
        };
 
+       nvmem_firmware {
+               compatible = "xlnx,zynqmp-nvmem-fw";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               soc_revision: soc_revision@0 {
+                       reg = <0x0 0x4>;
+               };
+       };
+
        pcap: pcap {
                compatible = "xlnx,zynqmp-pcap-fpga";
        };
@@ -672,6 +681,7 @@
                        interrupt-controller;
                        #interrupt-cells = <2>;
                        reg = <0x0 0xff0a0000 0x0 0x1000>;
+                       gpio-controller;
                        power-domains = <&pd_gpio>;
                };
 
@@ -726,6 +736,7 @@
                        reg-names = "breg", "pcireg", "cfg";
                        ranges = <0x02000000 0x00000000 0xe0000000 0x00000000 0xe0000000 0x00000000 0x10000000  /* non-prefetchable memory */
                                  0x43000000 0x00000006 0x00000000 0x00000006 0x00000000 0x00000002 0x00000000>;/* prefetchable memory */
+                       bus-range = <0x00 0xff>;
                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                        interrupt-map = <0x0 0x0 0x0 0x1 &pcie_intc 0x1>,
                                        <0x0 0x0 0x0 0x2 &pcie_intc 0x2>,
@@ -762,6 +773,7 @@
                        interrupt-parent = <&gic>;
                        interrupts = <0 26 4>, <0 27 4>;
                        interrupt-names = "alarm", "sec";
+                       calibration = <0x8000>;
                };
 
                serdes: zynqmp_phy@fd400000 {
@@ -772,7 +784,8 @@
                              <0x0 0xfd1a0000 0x0 0x1000>,
                              <0x0 0xff5e0000 0x0 0x1000>;
                        reg-names = "serdes", "siou", "fpd", "lpd";
-                       xlnx,tx_termination_fix;
+                       nvmem-cells = <&soc_revision>;
+                       nvmem-cell-names = "soc_revision";
                        lane0: lane0 {
                                #phy-cells = <4>;
                        };
@@ -794,6 +807,10 @@
                        interrupt-parent = <&gic>;
                        interrupts = <0 133 4>;
                        power-domains = <&pd_sata>;
+                       #stream-id-cells = <4>;
+                       iommus = <&smmu 0x4c0>, <&smmu 0x4c1>,
+                                <&smmu 0x4c2>, <&smmu 0x4c3>;
+                       /* dma-coherent; */
                };
 
                sdhci0: sdhci@ff160000 {
@@ -824,10 +841,17 @@
                        power-domains = <&pd_sd1>;
                };
 
+               pinctrl0: pinctrl@ff180000 {
+                       compatible = "xlnx,pinctrl-zynqmp";
+                       status = "disabled";
+                       reg = <0x0 0xff180000 0x0 0x1000>;
+               };
+
                smmu: smmu@fd800000 {
                        compatible = "arm,mmu-500";
                        reg = <0x0 0xfd800000 0x0 0x20000>;
                        #iommu-cells = <1>;
+                       status = "disabled";
                        #global-interrupts = <1>;
                        interrupt-parent = <&gic>;
                        interrupts = <0 155 4>,
@@ -835,32 +859,6 @@
                                <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>,
                                <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>,
                                <0 155 4>, <0 155 4>, <0 155 4>, <0 155 4>;
-                       mmu-masters = < &gem0 0x874
-                                       &gem1 0x875
-                                       &gem2 0x876
-                                       &gem3 0x877
-                                       &usb0 0x860
-                                       &usb1 0x861
-                                       &qspi 0x873
-                                       &lpd_dma_chan1 0x868
-                                       &lpd_dma_chan2 0x869
-                                       &lpd_dma_chan3 0x86a
-                                       &lpd_dma_chan4 0x86b
-                                       &lpd_dma_chan5 0x86c
-                                       &lpd_dma_chan6 0x86d
-                                       &lpd_dma_chan7 0x86e
-                                       &lpd_dma_chan8 0x86f
-                                       &fpd_dma_chan1 0x14e8
-                                       &fpd_dma_chan2 0x14e9
-                                       &fpd_dma_chan3 0x14ea
-                                       &fpd_dma_chan4 0x14eb
-                                       &fpd_dma_chan5 0x14ec
-                                       &fpd_dma_chan6 0x14ed
-                                       &fpd_dma_chan7 0x14ee
-                                       &fpd_dma_chan8 0x14ef
-                                       &sdhci0 0x870
-                                       &sdhci1 0x871
-                                       &nand0 0x872>;
                };
 
                spi0: spi@ff040000 {
@@ -1032,6 +1030,7 @@
                        interrupts = <0 119 4>;
                        interrupt-parent = <&gic>;
                        clock-names = "aclk", "aud_clk";
+                       power-domains = <&pd_dp>;
                        xlnx,dp-version = "v1.2";
                        xlnx,max-lanes = <2>;
                        xlnx,max-link-rate = <540000>;
@@ -1081,6 +1080,7 @@
                        xlnx,output-fmt = "rgb";
                        xlnx,vid-fmt = "yuyv";
                        xlnx,gfx-fmt = "rgb565";
+                       power-domains = <&pd_dp>;
                };
 
                xlnx_dpdma: dma@fd4c0000 {
@@ -1090,6 +1090,7 @@
                        interrupts = <0 122 4>;
                        interrupt-parent = <&gic>;
                        clock-names = "axi_clk";
+                       power-domains = <&pd_dp>;
                        dma-channels = <6>;
                        #dma-cells = <1>;
                        dma-video0channel {