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 fecef88e08094a5e247f54a7b439ea37b588f0c4..6402cf5aca50f59f4538f48e8f67130f767c9dc4 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 a357793bfaca5180aa22bddeccd32776c71f465a..88aa24a6d26a82995fe24e6ddab0bb5665c26674 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 a330597b6c047ed3969fd7d7cf64dabd66583fbd..910d2a5c778e59c5eeefc57fd95cdfcff2479ef2 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 55155fd32139b415f6e55d5dde78cd55c19ef5ab..3757051b78b74dee1d6fe0cb91b28451af438e1b 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 1125e5753b9583a281246af6c14a5604fbf89a5b..2d70c82a728c2a52b325c2ededfe2b435c3942b6 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 70e1a6a53f1130cd18f6eab0f4b1ac7d7359626f..884bdad196b31aa12e941fab66a5e6334dfaab63 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 0a959f0f2d2732e7c828cdc8b626c78c33b62c25..f7db44c0fa57ac1e14dd1584949c6520eb9a35bd 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 d39159322a5ba88baf19e8e95bda5129fd9479c7..cda05411d881af65a94d09ac074517e72d3ac57c 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 76dc397328a198df6aa31596b1f8b1a404d19ec6..fec5c8ddb23ac2e3968fbcc8081e9a3d60b3f5ab 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 cac65a7afad9fd36ba83a431fd4e94cf21cbb277..464129291c91d43fb86a4a7c8e1e1fe3a193bb06 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 4e91d5c9956392d5c1d6460d534b9867bae06760..8673a5db2af8ebc6c4b7467137bf88bf9e1af4c4 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 f07d0c6f2748939ffc161d9fab0b761510f79e86..4f37a28992d4420bd9cca1cf8efeb4c32f1433a1 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 46a5780547fe7439387ae00fa2f1e43b9be78877..de92bf22e203182fe65c955f3ca7373bcb6d4de4 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 133cacb93e39c1ae516de257aa7724675dacb359..bf303c6ad38b46f91fb9459cbe93285b4dcfafe2 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 13461b5c4580782e77b07aa0a37ed09fc2cb0c85..f91a48d9fddbee4c8f77c9486c232507917d3cc4 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 fb5777e268e4953b86fc9dea73b82e1f3ee2c957..90a0a3f8fbe76f29f3928ac73408ce7bb4288f00 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 16b9aeec966c0d1663bc97ca1732783be307afd4..179ed19bf2c1b6babf628bc5bdb2d4612ee22b35 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 27c96f95400ae4c586ffabc977c7ad9626093d0d..bf96af7e360f0b1179beb616f744b0db9c9c2f51 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 e419d9c44fcb008fd39541857179a2d99dca5870..0eeec43cccca75075547ec6a8e9895a687a1b9f9 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";
                };