dm: ls1021a: dts: Update DSPI node to support DM SPI

Update DSPI controller node in ls1021a.dtsi.
Update flash device node in ls1021a-qds.dts.
Ls1021a-twr board doesn't support DSPI, so remove DSPI node
in ls1021a-twr.dts.

Signed-off-by: Haikun Wang <Haikun.Wang@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/dts/ls1021a-qds.dts b/arch/arm/dts/ls1021a-qds.dts
index 7454ac6ca72a96b4e8e02b375d603b1fd778ba76..8971c18e2a2a83928cb250839bba0ddcd50a9702 100644 (file)
--- a/arch/arm/dts/ls1021a-qds.dts
+++ b/arch/arm/dts/ls1021a-qds.dts
@@ -18,6 +18,7 @@
                enet2_rgmii_phy = &rgmii_phy3;
                enet0_sgmii_phy = &sgmii_phy1c;
                enet1_sgmii_phy = &sgmii_phy1d;
+               spi1 = &dspi0;
        };
 };
 
@@ -28,7 +29,7 @@
        dspiflash: at45db021d@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "atmel,at45db021d", "atmel,at45", "atmel,dataflash";
+               compatible = "spi-flash";
                spi-max-frequency = <16000000>;
                spi-cpol;
                spi-cpha;

diff --git a/arch/arm/dts/ls1021a-twr.dts b/arch/arm/dts/ls1021a-twr.dts
index 2f0481d5bcbd83c179b11c394313720889e7d049..3d9f23bf1170eab1ddf46b73933a21cbac6240ea 100644 (file)
--- a/arch/arm/dts/ls1021a-twr.dts
+++ b/arch/arm/dts/ls1021a-twr.dts
@@ -19,21 +19,6 @@
        };
 };
 
-&dspi1 {
-       bus-num = <0>;
-       status = "okay";
-
-       dspiflash: s25fl064k@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "spansion,s25fl064k";
-               spi-max-frequency = <16000000>;
-               spi-cpol;
-               spi-cpha;
-               reg = <0>;
-       };
-};
-
 &i2c0 {
        status = "okay";
 };

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index 064d10c8b9a01916ecc8b306957388a784f83a3c..8b3c55776df19327ae80422ec7dcd8977c2525a1 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -152,7 +152,7 @@
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
                        clocks = <&platform_clk 1>;
-                       spi-num-chipselects = <5>;
+                       num-cs = <6>;
                        big-endian;
                        status = "disabled";
                };
@@ -165,7 +165,7 @@
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
                        clocks = <&platform_clk 1>;
-                       spi-num-chipselects = <5>;
+                       num-cs = <6>;
                        big-endian;
                        status = "disabled";
                };