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

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

diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
index dcfc00e0967bb301525870a14f3261ce127f52e4..d04e9625d29eb6b709285ae2c06c04b5df2ab9cb 100644 (file)
--- a/arch/arm/dts/zynq-zybo.dts
+++ b/arch/arm/dts/zynq-zybo.dts
@@ -16,6 +16,8 @@
        aliases {
                ethernet0 = &gem0;
                serial0 = &uart1;
+               spi0 = &qspi;
+               mmc0 = &sdhci0;
        };
 
        memory {
@@ -28,6 +30,11 @@
                stdout-path = "serial0:115200n8";
        };
 
+       usb_phy0: phy0 {
+               #phy-cells = <0>;
+               compatible = "usb-nop-xceiv";
+               reset-gpios = <&gpio0 46 1>;
+       };
 };
 
 &clkc {
@@ -45,6 +52,7 @@
 };
 
 &sdhci0 {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };
 
@@ -52,3 +60,14 @@
        u-boot,dm-pre-reloc;
        status = "okay";
 };
+
+&qspi {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
+&usb0 {
+       status = "okay";
+       dr_mode = "host";
+       usb-phy = <&usb_phy0>;
+};