colibri-vf: Disable pull-up configuration in GPIO pin mux

[u-boot] / arch / arm / dts / zynq-zc770-xm011.dts

diff --git a/arch/arm/dts/zynq-zc770-xm011.dts b/arch/arm/dts/zynq-zc770-xm011.dts
index f73c0ddcb8d4220c3ebaf9342221f9944fb40dd7..4fed2215365cf2d0585cc5d3cb4b5e2e4b9a80c9 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm011.dts
+++ b/arch/arm/dts/zynq-zc770-xm011.dts
@@ -18,9 +18,8 @@
        };
 
        chosen {
-               bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
-               linux,stdout-path = &uart1;
-               stdout-path = &uart1;
+               bootargs = "root=/dev/ram rw earlyprintk";
+               stdout-path = "serial0:115200n8";
        };
 
        memory {
@@ -34,12 +33,6 @@
        };
 };
 
-&spi0 {
-       status = "okay";
-       num-cs = <4>;
-       is-decoded-cs = <0>;
-};
-
 &can0 {
        status = "okay";
 };
@@ -54,7 +47,14 @@
        };
 };
 
+&spi0 {
+       status = "okay";
+       num-cs = <4>;
+       is-decoded-cs = <0>;
+};
+
 &uart1 {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };