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

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

diff --git a/arch/arm/dts/ls1021a-twr.dts b/arch/arm/dts/ls1021a-twr.dts
index 34ac82d1075e5bf43fc7211d04147ea6eeeef30e..0e61c07c5a6e598b24f8e43dbfef500a1b3c48c1 100644 (file)
--- a/arch/arm/dts/ls1021a-twr.dts
+++ b/arch/arm/dts/ls1021a-twr.dts
@@ -16,20 +16,19 @@
                enet2_rgmii_phy = &rgmii_phy1;
                enet0_sgmii_phy = &sgmii_phy2;
                enet1_sgmii_phy = &sgmii_phy0;
+               spi0 = &qspi;
        };
 };
 
-&dspi1 {
+&qspi {
        bus-num = <0>;
        status = "okay";
 
-       dspiflash: s25fl064k@0 {
+       qflash0: n25q128a13@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spansion,s25fl064k";
-               spi-max-frequency = <16000000>;
-               spi-cpol;
-               spi-cpha;
+               compatible = "spi-flash";
+               spi-max-frequency = <20000000>;
                reg = <0>;
        };
 };
@@ -46,7 +45,7 @@
        #address-cells = <2>;
        #size-cells = <1>;
        /* NOR Flash on board */
-       ranges = <0x0 0x0 0x0 0x60000000 0x08000000>;
+       ranges = <0x0 0x0 0x60000000 0x08000000>;
        status = "okay";
 
        nor@0,0 {