treewide: Update fsl qspi node dt properties as per spi-mem driver

According to new qspi driver, some properties like "bus-num, num-cs,
big-endian" are no longer used. Device endiannes can be determined from
device-type data in driver.

Now use board specific compatibles, generic node names and specific
labels to align with linux device-tree properties.

Also consolidate spi-max-frequency to 50Mhz treewide.

Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
index fecef88..6402cf5 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
+++ b/arch/arm/dts/fsl-ls1012a-2g5rdb.dts
@@ -21,14 +21,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fl128s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/fsl-ls1012a-frdm.dtsi b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
index a357793..88aa24a 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-frdm.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-frdm.dtsi
@@ -15,14 +15,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fl128s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/fsl-ls1012a-qds.dtsi b/arch/arm/dts/fsl-ls1012a-qds.dtsi
index a330597..910d2a5 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-qds.dtsi
@@ -43,14 +43,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fl128s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
index 55155fd..3757051 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi
@@ -19,14 +19,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fl128s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi
index 1125e57..2d70c82 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a.dtsi
+++ b/arch/arm/dts/fsl-ls1012a.dtsi
@@ -107,14 +107,12 @@
                };
 
                qspi: quadspi@1550000 {
-                       compatible = "fsl,vf610-qspi";
+                       compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x1550000 0x0 0x10000>,
                                <0x0 0x40000000 0x0 0x4000000>;
                        reg-names = "QuadSPI", "QuadSPI-memory";
-                       num-cs = <1>;
-                       big-endian;
                        status = "disabled";
                };
 

diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi
index 70e1a6a..884bdad 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi
@@ -53,14 +53,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fl128s@0 {
+       s25fl128s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi
index 0a959f0..f7db44c 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a.dtsi
+++ b/arch/arm/dts/fsl-ls1043a.dtsi
@@ -210,14 +210,12 @@
                        status = "disabled";
                };
                qspi: quadspi@1550000 {
-                       compatible = "fsl,vf610-qspi";
+                       compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x1550000 0x0 0x10000>,
-                               <0x0 0x40000000 0x0 0x4000000>;
+                               <0x0 0x40000000 0x0 0x1000000>;
                        reg-names = "QuadSPI", "QuadSPI-memory";
-                       num-cs = <2>;
-                       big-endian;
                        status = "disabled";
                };
 

diff --git a/arch/arm/dts/fsl-ls1046a-frwy.dts b/arch/arm/dts/fsl-ls1046a-frwy.dts
index d391593..cda0541 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-frwy.dts
+++ b/arch/arm/dts/fsl-ls1046a-frwy.dts
@@ -19,13 +19,12 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: mt25qu512abb8esf@0 {
+       mt25qu512a0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;
        };

diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index 76dc397..fec5c8d 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
@@ -53,14 +53,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fl128s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/fsl-ls1046a-rdb.dts b/arch/arm/dts/fsl-ls1046a-rdb.dts
index cac65a7..4641292 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1046a-rdb.dts
@@ -21,10 +21,9 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fs512s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -32,7 +31,7 @@
                reg = <0>;
        };
 
-       qflash1: s25fs512s@1 {
+       s25fs512s1: flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi
index 4e91d5c..8673a5d 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a.dtsi
+++ b/arch/arm/dts/fsl-ls1046a.dtsi
@@ -211,14 +211,12 @@
                };
 
                qspi: quadspi@1550000 {
-                       compatible = "fsl,vf610-qspi";
+                       compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x0 0x1550000 0x0 0x10000>,
                                <0x0 0x40000000 0x0 0x10000000>;
                        reg-names = "QuadSPI", "QuadSPI-memory";
-                       num-cs = <4>;
-                       big-endian;
                        status = "disabled";
                };
 

diff --git a/arch/arm/dts/fsl-ls1088a-qds.dts b/arch/arm/dts/fsl-ls1088a-qds.dts
index f07d0c6..4f37a28 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-qds.dts
+++ b/arch/arm/dts/fsl-ls1088a-qds.dts
@@ -108,10 +108,9 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fs512s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -119,7 +118,7 @@
                reg = <0>;
        };
 
-       qflash1: s25fs512s@1 {
+       s25fs512s1: flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls1088a-rdb.dts b/arch/arm/dts/fsl-ls1088a-rdb.dts
index 46a5780..de92bf2 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1088a-rdb.dts
@@ -143,10 +143,9 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fs512s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -154,7 +153,7 @@
                reg = <0>;
        };
 
-       qflash1: s25fs512s@1 {
+       s25fs512s1: flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi
index 133cacb..bf303c6 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a.dtsi
+++ b/arch/arm/dts/fsl-ls1088a.dtsi
@@ -92,7 +92,7 @@
        };
 
        qspi: quadspi@1550000 {
-               compatible = "fsl,vf610-qspi";
+               compatible = "fsl,ls1088a-qspi";
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x0 0x20c0000 0x0 0x10000>,

diff --git a/arch/arm/dts/fsl-ls2080a-qds.dts b/arch/arm/dts/fsl-ls2080a-qds.dts
index 13461b5..f91a48d 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a-qds.dts
+++ b/arch/arm/dts/fsl-ls2080a-qds.dts
@@ -72,14 +72,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fs256s@0 {
+       s25fs256s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi
index fb5777e..90a0a3f 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a.dtsi
+++ b/arch/arm/dts/fsl-ls2080a.dtsi
@@ -96,13 +96,13 @@
        };
 
        qspi: quadspi@1550000 {
-               compatible = "fsl,vf610-qspi";
+               compatible = "fsl,ls2080a-qspi";
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x0 0x20c0000 0x0 0x10000>,
                        <0x0 0x20000000 0x0 0x10000000>;
                reg-names = "QuadSPI", "QuadSPI-memory";
-               num-cs = <4>;
+               status = "disabled";
        };
 
        esdhc: esdhc@0 {

diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
index 16b9aee..179ed19 100644 (file)
--- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
+++ b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
@@ -125,10 +125,9 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: s25fs512s@0 {
+       s25fs512s0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -136,7 +135,7 @@
                reg = <0>;
        };
 
-       qflash1: s25fs512s@1 {
+       s25fs512s1: flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/ls1021a-twr.dtsi b/arch/arm/dts/ls1021a-twr.dtsi
index 27c96f9..bf96af7 100644 (file)
--- a/arch/arm/dts/ls1021a-twr.dtsi
+++ b/arch/arm/dts/ls1021a-twr.dtsi
@@ -24,14 +24,13 @@
 };
 
 &qspi {
-       bus-num = <0>;
        status = "okay";
 
-       qflash0: n25q128a13@0 {
+       n25q128a130: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               spi-max-frequency = <20000000>;
+               spi-max-frequency = <50000000>;
                reg = <0>;
        };
 };

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index e419d9c..0eeec43 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -169,14 +169,12 @@
                };
 
                qspi: quadspi@1550000 {
-                       compatible = "fsl,vf610-qspi";
+                       compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x1550000 0x10000>,
-                               <0x40000000 0x4000000>;
+                               <0x40000000 0x1000000>;
                        reg-names = "QuadSPI", "QuadSPI-memory";
-                       num-cs = <2>;
-                       big-endian;
                        status = "disabled";
                };