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

[oweals/u-boot.git] / arch / arm / dts / zynq-zc706.dts

diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts
index 8b0177bc512a3c61a61e5813b7193ba7b8a4c60a..84729e9feba270b419c95727d75eac49f85dff37 100644 (file)
--- a/arch/arm/dts/zynq-zc706.dts
+++ b/arch/arm/dts/zynq-zc706.dts
@@ -1,16 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Xilinx ZC706 board DTS
- *
  *  Copyright (C) 2011 - 2015 Xilinx
  *  Copyright (C) 2012 National Instruments Corp.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 /dts-v1/;
 #include "zynq-7000.dtsi"
 
 / {
-       model = "Zynq ZC706 Development Board";
+       model = "Xilinx ZC706 board";
        compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
 
        aliases {
@@ -50,6 +47,7 @@
 
        ethernet_phy: ethernet-phy@7 {
                reg = <7>;
+               device_type = "ethernet-phy";
        };
 };
 
@@ -64,7 +62,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c0_default>;
 
-       i2cswitch@74 {
+       i2c-mux@74 {
                compatible = "nxp,pca9548";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -104,7 +102,7 @@
                        #size-cells = <0>;
                        reg = <2>;
                        eeprom@54 {
-                               compatible = "at,24c08";
+                               compatible = "atmel,24c08";
                                reg = <0x54>;
                        };
                };
@@ -332,3 +330,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
 };
+
+&watchdog0 {
+       reset-on-timeout;
+};