Merge https://gitlab.denx.de/u-boot/custodians/u-boot-clk

[oweals/u-boot.git] / arch / arm / dts / zynqmp-zcu111-revA.dts

diff --git a/arch/arm/dts/zynqmp-zcu111-revA.dts b/arch/arm/dts/zynqmp-zcu111-revA.dts
index 4002d7880610f00bc264e2b6b651fc26f3bb2f52..2e28a3934fd307d39993d3aaf5a63a8e1f60c44b 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu111-revA.dts
+++ b/arch/arm/dts/zynqmp-zcu111-revA.dts
@@ -35,6 +35,7 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
+               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {
@@ -45,8 +46,6 @@
 
        gpio-keys {
                compatible = "gpio-keys";
-               #address-cells = <1>;
-               #size-cells = <0>;
                autorepeat;
                sw19 {
                        label = "sw19";
@@ -320,6 +319,7 @@
                                temperature-stability = <50>;
                                factory-fout = <300000000>;
                                clock-frequency = <300000000>;
+                               clock-output-names = "si570_user";
                        };
                };
                i2c@3 {
@@ -333,6 +333,7 @@
                                temperature-stability = <50>;
                                factory-fout = <156250000>;
                                clock-frequency = <148500000>;
+                               clock-output-names = "si570_mgt";
                        };
                };
                i2c@4 {
@@ -399,26 +400,6 @@
                        #size-cells = <0>;
                        reg = <3>;
                        /* DDR4 SODIMM */
-                       dev@19 { /* u-boot detection FIXME */
-                               compatible = "xxx";
-                               reg = <0x19>;
-                       };
-                       dev@30 { /* u-boot detection */
-                               compatible = "xxx";
-                               reg = <0x30>;
-                       };
-                       dev@35 { /* u-boot detection */
-                               compatible = "xxx";
-                               reg = <0x35>;
-                       };
-                       dev@36 { /* u-boot detection */
-                               compatible = "xxx";
-                               reg = <0x36>;
-                       };
-                       dev@51 { /* u-boot detection - maybe SPD */
-                               compatible = "xxx";
-                               reg = <0x51>;
-                       };
                };
                i2c@4 {
                        #address-cells = <1>;
@@ -451,7 +432,7 @@
        status = "okay";
        is-dual = <1>;
        flash@0 {
-               compatible = "m25p80"; /* 32MB */
+               compatible = "m25p80", "jedec,spi-nor"; /* 32MB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;
@@ -500,6 +481,7 @@
 &sdhci1 {
        status = "okay";
        no-1-8-v;
+       disable-wp;
        xlnx,mio_bank = <1>;
 };