Merge tag 'u-boot-atmel-2019.10-a' of https://gitlab.denx.de/u-boot/custodians/u...

[oweals/u-boot.git] / arch / arm / dts / zynqmp-zcu104-revC.dts

diff --git a/arch/arm/dts/zynqmp-zcu104-revC.dts b/arch/arm/dts/zynqmp-zcu104-revC.dts
index fe742b894b8993cd58ea759737a122d572ae6f0f..7df16b047ceb01b595313dee316bc194eb94db51 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu104-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu104-revC.dts
@@ -34,6 +34,7 @@
        chosen {
                bootargs = "earlycon";
                stdout-path = "serial0:115200n8";
+               xlnx,eeprom = &eeprom;
        };
 
        memory@0 {
@@ -175,7 +176,7 @@
 &qspi {
        status = "okay";
        flash@0 {
-               compatible = "m25p80"; /* n25q512a 128MiB */
+               compatible = "m25p80", "jedec,spi-nor"; /* n25q512a 128MiB */
                #address-cells = <1>;
                #size-cells = <1>;
                reg = <0x0>;