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 d04e9625d29eb6b709285ae2c06c04b5df2ab9cb..d59a3831352db66f137505bf4a0ce35b371a9f29 100644 (file)
--- a/arch/arm/dts/zynq-zybo.dts
+++ b/arch/arm/dts/zynq-zybo.dts
@@ -20,19 +20,19 @@
                mmc0 = &sdhci0;
        };
 
-       memory {
+       memory@0 {
                device_type = "memory";
                reg = <0x0 0x20000000>;
        };
 
        chosen {
-               bootargs = "earlyprintk";
+               bootargs = "";
                stdout-path = "serial0:115200n8";
        };
 
        usb_phy0: phy0 {
-               #phy-cells = <0>;
                compatible = "usb-nop-xceiv";
+               #phy-cells = <0>;
                reset-gpios = <&gpio0 46 1>;
        };
 };
@@ -51,17 +51,17 @@
        };
 };
 
-&sdhci0 {
+&qspi {
        u-boot,dm-pre-reloc;
        status = "okay";
 };
 
-&uart1 {
+&sdhci0 {
        u-boot,dm-pre-reloc;
        status = "okay";
 };
 
-&qspi {
+&uart1 {
        u-boot,dm-pre-reloc;
        status = "okay";
 };