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

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

diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
index 10f78155244d7ec6a00b1e2ad77274cc2d2be485..d59a3831352db66f137505bf4a0ce35b371a9f29 100644 (file)
--- a/arch/arm/dts/zynq-zybo.dts
+++ b/arch/arm/dts/zynq-zybo.dts
@@ -16,18 +16,25 @@
        aliases {
                ethernet0 = &gem0;
                serial0 = &uart1;
+               spi0 = &qspi;
+               mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x20000000>;
        };
 
        chosen {
-               bootargs = "earlyprintk";
+               bootargs = "";
                stdout-path = "serial0:115200n8";
        };
 
+       usb_phy0: phy0 {
+               compatible = "usb-nop-xceiv";
+               #phy-cells = <0>;
+               reset-gpios = <&gpio0 46 1>;
+       };
 };
 
 &clkc {
@@ -44,10 +51,23 @@
        };
 };
 
+&qspi {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
 &sdhci0 {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };
 
 &uart1 {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&usb0 {
        status = "okay";
+       dr_mode = "host";
+       usb-phy = <&usb_phy0>;
 };