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 6e575a063befbacfcaa8926f0daef2e16702dce7..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
@@ -11,7 +11,7 @@
 /dts-v1/;
 
 #include "zynqmp.dtsi"
-#include "zynqmp-clk.dtsi"
+#include "zynqmp-clk-ccf.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
@@ -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";
@@ -104,6 +104,7 @@
 
        ltc2954: ltc2954 { /* U7 */
                compatible = "lltc,ltc2954", "lltc,ltc2952";
+               status = "disabled";
                trigger-gpios = <&gpio 26 GPIO_ACTIVE_LOW>; /* INT line - input */
                /* If there is HW watchdog on mezzanine this signal should be connected there */
                watchdog-gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; /* MIO on PAD */
@@ -119,9 +120,15 @@
                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 {
+               compatible = "iio-hwmon";
+               io-channels = <&u35 0>, <&u35 1>, <&u35 2>, <&u35 3>;
        };
 };
 
@@ -215,8 +222,9 @@
                        #size-cells = <0>;
                        reg = <5>;
                        /* PS_PMBUS */
-                       ina226@40 { /* u35 */
+                       u35: ina226@40 { /* u35 */
                                compatible = "ti,ina226";
+                               #io-channel-cells = <1>;
                                reg = <0x40>;
                                shunt-resistor = <10000>;
                                /* MIO31 is alert which should be routed to PMUFW */
@@ -280,11 +288,13 @@
 &spi0 { /* Low Speed connector */
        status = "okay";
        label = "LS-SPI0";
+       num-cs = <1>;
 };
 
 &spi1 { /* High Speed connector */
        status = "okay";
        label = "HS-SPI1";
+       num-cs = <1>;
 };
 
 &uart0 {
@@ -293,7 +303,6 @@
                compatible = "ti,wl1831-st";
                enable-gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
        };
-
 };
 
 &uart1 {
@@ -329,7 +338,6 @@
 
 &watchdog0 {
        status = "okay";
-       reset-on-timeout;
 };
 
 &xilinx_ams {