Merge git://git.denx.de/u-boot-fsl-qoriq

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

diff --git a/arch/arm/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts
index da3a182ea1e1706a513048949686d5f01051e5b3..cc5ba98d6bd9a71db3c9e7b0c433d304b8a09293 100644 (file)
--- a/arch/arm/dts/zynq-zc770-xm010.dts
+++ b/arch/arm/dts/zynq-zc770-xm010.dts
@@ -16,13 +16,13 @@
                ethernet0 = &gem0;
                i2c0 = &i2c0;
                serial0 = &uart1;
-               spi0 = &spi1;
+               spi0 = &qspi;
+               spi1 = &spi1;
        };
 
        chosen {
-               bootargs = "console=ttyPS0,115200 root=/dev/ram rw earlyprintk";
-               linux,stdout-path = &uart1;
-               stdout-path = &uart1;
+               bootargs = "";
+               stdout-path = "serial0:115200n8";
        };
 
        memory@0 {
@@ -36,23 +36,6 @@
        };
 };
 
-&spi1 {
-       status = "okay";
-       num-cs = <4>;
-       is-decoded-cs = <0>;
-       flash@0 {
-               compatible = "sst25wf080";
-               reg = <1>;
-               spi-max-frequency = <1000000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               partition@test {
-                       label = "spi-flash";
-                       reg = <0x0 0x100000>;
-               };
-       };
-};
-
 &can0 {
        status = "okay";
 };
@@ -64,6 +47,7 @@
 
        ethernet_phy: ethernet-phy@7 {
                reg = <7>;
+               device_type = "ethernet-phy";
        };
 };
 
@@ -78,11 +62,33 @@
 
 };
 
+&qspi {
+       status = "okay";
+};
+
 &sdhci0 {
        status = "okay";
 };
 
+&spi1 {
+       status = "okay";
+       num-cs = <4>;
+       is-decoded-cs = <0>;
+       flash@0 {
+               compatible = "sst25wf080";
+               reg = <1>;
+               spi-max-frequency = <1000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               partition@test {
+                       label = "spi-flash";
+                       reg = <0x0 0x100000>;
+               };
+       };
+};
+
 &uart1 {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };