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

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

diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
index 5762576fea2de490aeb046f9dec16ad48c20f252..0ac7532300f030d13d9aaa2e475de7e4d1705dee 100644 (file)
--- a/arch/arm/dts/zynq-zed.dts
+++ b/arch/arm/dts/zynq-zed.dts
@@ -16,15 +16,17 @@
        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";
        };
 
@@ -48,11 +50,18 @@
        };
 };
 
+&qspi {
+       u-boot,dm-pre-reloc;
+       status = "okay";
+};
+
 &sdhci0 {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };
 
 &uart1 {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };