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

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

diff --git a/arch/arm/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts
index 3e1769acb51f994c20a85f9353efc450563560aa..6cab8326677009a48c1f674f0ded01b7decfa763 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm012.dts
+++ b/arch/arm/dts/zynq-zc770-xm012.dts
@@ -20,9 +20,8 @@
        };
 
        chosen {
-               bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
-               linux,stdout-path = &uart1;
-               stdout-path = &uart1;
+               bootargs = "";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -31,12 +30,6 @@
        };
 };
 
-&spi1 {
-       status = "okay";
-       num-cs = <4>;
-       is-decoded-cs = <0>;
-};
-
 &can1 {
        status = "okay";
 };
@@ -61,6 +54,12 @@
        };
 };
 
+&spi1 {
+       status = "okay";
+       num-cs = <4>;
+       is-decoded-cs = <0>;
+};
+
 &uart1 {
        u-boot,dm-pre-reloc;
        status = "okay";