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

[oweals/u-boot.git] / arch / arm / dts / zynqmp-zc1751-xm016-dc2.dts

diff --git a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
index afa90a8a5b09df60fa4230c4ce64e5175898d2a8..92d938d665d20ad6ccd9b7bdf5c0eda7887f0e4f 100644 (file)
--- a/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
+++ b/arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts
@@ -2,7 +2,7 @@
 /*
  * dts file for Xilinx ZynqMP zc1751-xm016-dc2
  *
- * (C) Copyright 2015 - 2018, Xilinx, Inc.
+ * (C) Copyright 2015 - 2020, Xilinx, Inc.
  *
  * Michal Simek <michal.simek@xilinx.com>
  */
@@ -85,11 +85,12 @@
        status = "okay";
        phy-handle = <&phy0>;
        phy-mode = "rgmii-id";
-       phy0: phy@5 {
+       phy0: ethernet-phy@5 {
                reg = <5>;
                ti,rx-internal-delay = <0x8>;
                ti,tx-internal-delay = <0xa>;
                ti,fifo-depth = <0x1>;
+               ti,dp83867-rxctrl-strap-quirk;
        };
 };
 
@@ -118,56 +119,66 @@
 &nand0 {
        status = "okay";
        arasan,has-mdma;
-       num-cs = <2>;
 
-       partition@0 {   /* for testing purpose */
-               label = "nand-fsbl-uboot";
-               reg = <0x0 0x0 0x400000>;
-       };
-       partition@1 {   /* for testing purpose */
-               label = "nand-linux";
-               reg = <0x0 0x400000 0x1400000>;
-       };
-       partition@2 {   /* for testing purpose */
-               label = "nand-device-tree";
-               reg = <0x0 0x1800000 0x400000>;
-       };
-       partition@3 {   /* for testing purpose */
-               label = "nand-rootfs";
-               reg = <0x0 0x1C00000 0x1400000>;
-       };
-       partition@4 {   /* for testing purpose */
-               label = "nand-bitstream";
-               reg = <0x0 0x3000000 0x400000>;
-       };
-       partition@5 {   /* for testing purpose */
-               label = "nand-misc";
-               reg = <0x0 0x3400000 0xFCC00000>;
-       };
+       nand@0 {
+               reg = <0x0>;
+               #address-cells = <0x2>;
+               #size-cells = <0x1>;
 
-       partition@6 {   /* for testing purpose */
-               label = "nand1-fsbl-uboot";
-               reg = <0x1 0x0 0x400000>;
-       };
-       partition@7 {   /* for testing purpose */
-               label = "nand1-linux";
-               reg = <0x1 0x400000 0x1400000>;
-       };
-       partition@8 {   /* for testing purpose */
-               label = "nand1-device-tree";
-               reg = <0x1 0x1800000 0x400000>;
-       };
-       partition@9 {   /* for testing purpose */
-               label = "nand1-rootfs";
-               reg = <0x1 0x1C00000 0x1400000>;
-       };
-       partition@10 {  /* for testing purpose */
-               label = "nand1-bitstream";
-               reg = <0x1 0x3000000 0x400000>;
+               partition@0 {   /* for testing purpose */
+                       label = "nand-fsbl-uboot";
+                       reg = <0x0 0x0 0x400000>;
+               };
+               partition@1 {   /* for testing purpose */
+                       label = "nand-linux";
+                       reg = <0x0 0x400000 0x1400000>;
+               };
+               partition@2 {   /* for testing purpose */
+                       label = "nand-device-tree";
+                       reg = <0x0 0x1800000 0x400000>;
+               };
+               partition@3 {   /* for testing purpose */
+                       label = "nand-rootfs";
+                       reg = <0x0 0x1c00000 0x1400000>;
+               };
+               partition@4 {   /* for testing purpose */
+                       label = "nand-bitstream";
+                       reg = <0x0 0x3000000 0x400000>;
+               };
+               partition@5 {   /* for testing purpose */
+                       label = "nand-misc";
+                       reg = <0x0 0x3400000 0xfcc00000>;
+               };
        };
-       partition@11 {  /* for testing purpose */
-               label = "nand1-misc";
-               reg = <0x1 0x3400000 0xFCC00000>;
+       nand@1 {
+               reg = <0x1>;
+               #address-cells = <0x2>;
+               #size-cells = <0x1>;
+
+               partition@0 {   /* for testing purpose */
+                       label = "nand1-fsbl-uboot";
+                       reg = <0x0 0x0 0x400000>;
+               };
+               partition@1 {   /* for testing purpose */
+                       label = "nand1-linux";
+                       reg = <0x0 0x400000 0x1400000>;
+               };
+               partition@2 {   /* for testing purpose */
+                       label = "nand1-device-tree";
+                       reg = <0x0 0x1800000 0x400000>;
+               };
+               partition@3 {   /* for testing purpose */
+                       label = "nand1-rootfs";
+                       reg = <0x0 0x1c00000 0x1400000>;
+               };
+               partition@4 {   /* for testing purpose */
+                       label = "nand1-bitstream";
+                       reg = <0x0 0x3000000 0x400000>;
+               };
+               partition@5 {   /* for testing purpose */
+                       label = "nand1-misc";
+                       reg = <0x0 0x3400000 0xfcc00000>;
+               };
        };
 };
 
@@ -186,7 +197,7 @@
                reg = <0>;
 
                partition@0 {
-                       label = "data";
+                       label = "spi0-data";
                        reg = <0x0 0x100000>;
                };
        };
@@ -203,7 +214,7 @@
                reg = <0>;
 
                partition@0 {
-                       label = "data";
+                       label = "spi1-data";
                        reg = <0x0 0x84000>;
                };
        };