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 cf7bce4468de227f251cf7705d8b1329d0bc9c8f..84729e9feba270b419c95727d75eac49f85dff37 100644 (file)
--- a/arch/arm/dts/zynq-zc706.dts
+++ b/arch/arm/dts/zynq-zc706.dts
@@ -1,31 +1,30 @@
+// 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 {
                ethernet0 = &gem0;
                i2c0 = &i2c0;
                serial0 = &uart1;
+               spi0 = &qspi;
+               mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x40000000>;
        };
 
        chosen {
-               bootargs = "earlyprintk";
+               bootargs = "";
                stdout-path = "serial0:115200n8";
        };
 
@@ -48,6 +47,7 @@
 
        ethernet_phy: ethernet-phy@7 {
                reg = <7>;
+               device_type = "ethernet-phy";
        };
 };
 
@@ -62,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>;
@@ -82,12 +82,27 @@
                        };
                };
 
+               i2c@1 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <1>;
+                       adv7511: hdmi-tx@39 {
+                               compatible = "adi,adv7511";
+                               reg = <0x39>;
+                               adi,input-depth = <8>;
+                               adi,input-colorspace = "yuv422";
+                               adi,input-clock = "1x";
+                               adi,input-style = <3>;
+                               adi,input-justification = "evenly";
+                       };
+               };
+
                i2c@2 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <2>;
                        eeprom@54 {
-                               compatible = "at,24c08";
+                               compatible = "atmel,24c08";
                                reg = <0x54>;
                        };
                };
@@ -289,13 +304,20 @@
        };
 };
 
+&qspi {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
 &sdhci0 {
+       u-boot,dm-pre-reloc;
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_sdhci0_default>;
 };
 
 &uart1 {
+       u-boot,dm-pre-reloc;
        status = "okay";
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1_default>;
@@ -308,3 +330,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb0_default>;
 };
+
+&watchdog0 {
+       reset-on-timeout;
+};