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

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

diff --git a/arch/arm/dts/zynqmp-zcu100-revC.dts b/arch/arm/dts/zynqmp-zcu100-revC.dts
index 106b56b66222cfee4d5947bfac4e0259b85ca3e3..1726edf78ed23a64decc9a9e894526c11c339747 100644 (file)
--- a/arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/arch/arm/dts/zynqmp-zcu100-revC.dts
@@ -2,7 +2,7 @@
 /*
  * dts file for Xilinx ZynqMP ZCU100 revC
  *
- * (C) Copyright 2016 - 2018, Xilinx, Inc.
+ * (C) Copyright 2016 - 2020, Xilinx, Inc.
  *
  * Michal Simek <michal.simek@xilinx.com>
  * Nathalie Chan King Choy
@@ -53,7 +53,7 @@
                        label = "sw4";
                        gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
-                       gpio-key,wakeup;
+                       wakeup-source;
                        autorepeat;
                };
        };
@@ -95,7 +95,7 @@
                        linux,default-trigger = "bluetooth-power";
                };
 
-               vbus_det { /* U5 USB5744 VBUS detection via MIO25 */
+               vbus-det { /* U5 USB5744 VBUS detection via MIO25 */
                        label = "vbus_det";
                        gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
@@ -120,9 +120,10 @@
                regulator-boot-on;
        };
 
-       sdio_pwrseq: sdio_pwrseq {
+       sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */
+               post-power-on-delay-ms = <10>;
        };
 
        ina226 {