Merge git://git.denx.de/u-boot-x86

[u-boot] / arch / arm / dts / ls1021a-qds.dts

diff --git a/arch/arm/dts/ls1021a-qds.dts b/arch/arm/dts/ls1021a-qds.dts
index c89f85e001fa653f1a6e1f56f1f41f70c7991ed8..e634292359237fb118be98dacad2ed76e425e072 100644 (file)
--- a/arch/arm/dts/ls1021a-qds.dts
+++ b/arch/arm/dts/ls1021a-qds.dts
@@ -18,6 +18,8 @@
                enet2_rgmii_phy = &rgmii_phy3;
                enet0_sgmii_phy = &sgmii_phy1c;
                enet1_sgmii_phy = &sgmii_phy1d;
+               spi0 = &qspi;
+               spi1 = &dspi0;
        };
 };
 
@@ -28,7 +30,7 @@
        dspiflash: at45db021d@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "atmel,at45db021d", "atmel,at45", "atmel,dataflash";
+               compatible = "atmel,dataflash";
                spi-max-frequency = <16000000>;
                spi-cpol;
                spi-cpha;
@@ -36,6 +38,19 @@
        };
 };
 
+&qspi {
+       bus-num = <0>;
+       status = "okay";
+
+       qflash0: s25fl128s@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "spi-flash";
+               spi-max-frequency = <20000000>;
+               reg = <0>;
+       };
+};
+
 &i2c0 {
        status = "okay";
 
@@ -101,9 +116,9 @@
        #address-cells = <2>;
        #size-cells = <1>;
        /* NOR, NAND Flashes and FPGA on board */
-       ranges = <0x0 0x0 0x0 0x60000000 0x08000000
-                 0x2 0x0 0x0 0x7e800000 0x00010000
-                 0x3 0x0 0x0 0x7fb00000 0x00000100>;
+       ranges = <0x0 0x0 0x60000000 0x08000000
+                 0x2 0x0 0x7e800000 0x00010000
+                 0x3 0x0 0x7fb00000 0x00000100>;
        status = "okay";
 
        nor@0,0 {