arm: dts: layerscape: Fix DT build warning in SPI nodes

There are lots of DT warning in layerscape DTS files like:
node name for SPI buses should be 'spi' and SPI bus unit address
format error.
Update the spi node name and flash node name to avoid build warning

Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/dts/fsl-ls1012a-qds.dtsi b/arch/arm/dts/fsl-ls1012a-qds.dtsi
index 910d2a5c778e59c5eeefc57fd95cdfcff2479ef2..194ab344350efed56a5ea5bd2926dece62f19c45 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1012a-qds.dtsi
@@ -17,7 +17,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q128a {
+       dflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -25,7 +25,7 @@
                spi-max-frequency = <1000000>; /* input clock */
        };
 
-       dflash1: sst25wf040b {
+       dflash1: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -33,7 +33,7 @@
                reg = <1>;
        };
 
-       dflash2: en25s64 {
+       dflash2: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi
index 796d72fc9edb91f230883aa80dde434ff59747d9..b0f3fd790943c58ad4c45c3d6358faf47096c9e6 100644 (file)
--- a/arch/arm/dts/fsl-ls1012a.dtsi
+++ b/arch/arm/dts/fsl-ls1012a.dtsi
@@ -48,7 +48,7 @@
                        clocks = <&sysclk>;
                };
 
-               dspi0: dspi@2100000 {
+               dspi0: spi@2100000 {
                        compatible = "fsl,vf610-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -178,7 +178,7 @@
                        clocks = <&clockgen 4 0>;
                };
 
-               qspi: quadspi@1550000 {
+               qspi: spi@1550000 {
                        compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/arch/arm/dts/fsl-ls1028a-qds.dtsi b/arch/arm/dts/fsl-ls1028a-qds.dtsi
index 3b063d0257deadd3dfc02efbb169af4f0dd78c6e..6d3f08bd6783890337dab6d0f8891416c43d4c9f 100644 (file)
--- a/arch/arm/dts/fsl-ls1028a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1028a-qds.dtsi
@@ -26,7 +26,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: sst25wf040b {
+       dflash0: sst25wf040b@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -36,7 +36,7 @@
                reg = <0>;
        };
 
-       dflash1: en25s64 {
+       dflash1: en25s64@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -45,7 +45,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash2: n25q128a {
+       dflash2: n25q128a@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -60,7 +60,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash3: sst25wf040b {
+       dflash3: sst25wf040b@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -70,7 +70,7 @@
                reg = <0>;
        };
 
-       dflash4: en25s64 {
+       dflash4: en25s64@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -79,7 +79,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash5: n25q128a {
+       dflash5: n25q128a@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -94,7 +94,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash8: en25s64 {
+       dflash8: en25s64@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";

diff --git a/arch/arm/dts/fsl-ls1043a-qds.dtsi b/arch/arm/dts/fsl-ls1043a-qds.dtsi
index 5e02cd91d75f2d7375533066214cf549dcdc666f..fa1bda5110804e8efc97d6d34afbcc7d3ef3470f 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1043a-qds.dtsi
@@ -21,7 +21,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q128a {
+       dflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -31,7 +31,7 @@
                reg = <0>;
        };
 
-       dflash1: sst25wf040b {
+       dflash1: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -41,7 +41,7 @@
                reg = <1>;
        };
 
-       dflash2: en25s64 {
+       dflash2: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls1043a-rdb.dts b/arch/arm/dts/fsl-ls1043a-rdb.dts
index f5b3bb68b3db47e66e934fcb392d2471652f2b7c..80787907df6c3df458cbd064c81b0667aa6e2750 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a-rdb.dts
+++ b/arch/arm/dts/fsl-ls1043a-rdb.dts
@@ -28,7 +28,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dspiflash: n25q12a {
+       dspiflash: n25q12a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi
index 21643a1d951f38075f1f06a315d4afd3ad706523..7337d3cecb6b7c894cc7fbb1814a2996f784bba1 100644 (file)
--- a/arch/arm/dts/fsl-ls1043a.dtsi
+++ b/arch/arm/dts/fsl-ls1043a.dtsi
@@ -54,7 +54,7 @@
                        clocks = <&sysclk>;
                };
 
-               dspi0: dspi@2100000 {
+               dspi0: spi@2100000 {
                        compatible = "fsl,vf610-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -67,7 +67,7 @@
                        status = "disabled";
                };
 
-               dspi1: dspi@2110000 {
+               dspi1: spi@2110000 {
                        compatible = "fsl,vf610-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -306,7 +306,7 @@
                        clock-names = "ipg";
                        status = "disabled";
                };
-               qspi: quadspi@1550000 {
+               qspi: spi@1550000 {
                        compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/arch/arm/dts/fsl-ls1046a-qds.dtsi b/arch/arm/dts/fsl-ls1046a-qds.dtsi
index d66824975c5ea15ebf79dba115df9e5d65d7a329..706405ba8056e9f942f5353ea05ab10a473d98ae 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1046a-qds.dtsi
@@ -21,7 +21,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q128a {
+       dflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -31,7 +31,7 @@
                reg = <0>;
        };
 
-       dflash1: sst25wf040b {
+       dflash1: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -41,7 +41,7 @@
                reg = <1>;
        };
 
-       dflash2: en25s64 {
+       dflash2: en25s64@2 {
                #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 44ee4c5808da866d332bf060478de4d20be99b0a..ceb5d6b3356300331b45e5c2b7075c7583035a2a 100644 (file)
--- a/arch/arm/dts/fsl-ls1046a.dtsi
+++ b/arch/arm/dts/fsl-ls1046a.dtsi
@@ -54,7 +54,7 @@
                        clocks = <&sysclk>;
                };
 
-               dspi0: dspi@2100000 {
+               dspi0: spi@2100000 {
                        compatible = "fsl,vf610-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -67,7 +67,7 @@
                        status = "disabled";
                };
 
-               dspi1: dspi@2110000 {
+               dspi1: spi@2110000 {
                        compatible = "fsl,vf610-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -311,7 +311,7 @@
                        status = "disabled";
                };
 
-               qspi: quadspi@1550000 {
+               qspi: spi@1550000 {
                        compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;

diff --git a/arch/arm/dts/fsl-ls1088a-qds.dtsi b/arch/arm/dts/fsl-ls1088a-qds.dtsi
index 4d21d4fbd5e01e1ac1f65afc176cca46d562a9e4..83635a2e40d4ec4537f1ee9e144cc0be2d283333 100644 (file)
--- a/arch/arm/dts/fsl-ls1088a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls1088a-qds.dtsi
@@ -144,7 +144,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q128a {
+       dflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -152,7 +152,7 @@
                spi-max-frequency = <1000000>; /* input clock */
        };
 
-       dflash1: sst25wf040b {
+       dflash1: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -160,7 +160,7 @@
                reg = <1>;
        };
 
-       dflash2: en25s64 {
+       dflash2: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls2080a-qds.dtsi b/arch/arm/dts/fsl-ls2080a-qds.dtsi
index cb7851f2cc015c578b237117d1f85382b84988ec..f442baa8bfe7d9e34d00c4ff66104f75ad8681f6 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a-qds.dtsi
+++ b/arch/arm/dts/fsl-ls2080a-qds.dtsi
@@ -31,7 +31,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q128a {
+       dflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -40,7 +40,7 @@
                spi-cpha;
                reg = <0>;
        };
-       dflash1: sst25wf040b {
+       dflash1: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";
@@ -49,7 +49,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash2: en25s64 {
+       dflash2: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls2080a-rdb.dts b/arch/arm/dts/fsl-ls2080a-rdb.dts
index 0a87caeba967bd8436ac0a5e76fc6979e73d4b50..5a9b5c06e234a1f3df32e00e648b78c2a1f52ea4 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a-rdb.dts
+++ b/arch/arm/dts/fsl-ls2080a-rdb.dts
@@ -22,7 +22,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q512a {
+       dflash0: n25q512a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi
index d754eb4d5cc80c5d5577816276aba7285a5b2e36..c1173a95f24f2512b2f972384ba21e451976ff3c 100644 (file)
--- a/arch/arm/dts/fsl-ls2080a.dtsi
+++ b/arch/arm/dts/fsl-ls2080a.dtsi
@@ -118,7 +118,7 @@
                interrupts = <0 35 0x4>; /* Level high type */
        };
 
-       dspi: dspi@2100000 {
+       dspi: spi@2100000 {
                compatible = "fsl,vf610-dspi";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -127,7 +127,7 @@
                spi-num-chipselects = <6>;
        };
 
-       qspi: quadspi@1550000 {
+       qspi: spi@1550000 {
                compatible = "fsl,ls2080a-qspi";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/fsl-ls2081a-rdb.dts b/arch/arm/dts/fsl-ls2081a-rdb.dts
index b0b7ef08a021823728f9b6f420a6afef4993854b..61f0ed9b8215ae59bb02627b7d0ec3f9ca242ae0 100644 (file)
--- a/arch/arm/dts/fsl-ls2081a-rdb.dts
+++ b/arch/arm/dts/fsl-ls2081a-rdb.dts
@@ -25,7 +25,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q512a {
+       dflash0: n25q512a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
index a609290000f3793934c1067951e98ed51eb0c4ad..1884946cc7a9cd326c98eee2e2090e4aa7b319f8 100644 (file)
--- a/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
+++ b/arch/arm/dts/fsl-ls2088a-rdb-qspi.dts
@@ -113,7 +113,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q512a {
+       dflash0: n25q512a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm/dts/fsl-lx2160a-qds.dtsi b/arch/arm/dts/fsl-lx2160a-qds.dtsi
index e96605b1b4fb5e0e8bd16bcbb16afd54be1e0886..dfdad5fb31f12997a73109709b26da63ccfeee80 100644 (file)
--- a/arch/arm/dts/fsl-lx2160a-qds.dtsi
+++ b/arch/arm/dts/fsl-lx2160a-qds.dtsi
@@ -31,7 +31,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q128a {
+       dflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -40,7 +40,7 @@
                spi-cpha;
                reg = <0>;
        };
-       dflash1: sst25wf040b {
+       dflash1: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -49,7 +49,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash2: en25s64 {
+       dflash2: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -64,7 +64,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash3: n25q128a {
+       dflash3: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -73,7 +73,7 @@
                spi-cpha;
                reg = <0>;
        };
-       dflash4: sst25wf040b {
+       dflash4: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -82,7 +82,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash5: en25s64 {
+       dflash5: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -97,7 +97,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash6: n25q128a {
+       dflash6: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -106,7 +106,7 @@
                spi-cpha;
                reg = <0>;
        };
-       dflash7: sst25wf040b {
+       dflash7: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -115,7 +115,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash8: en25s64 {
+       dflash8: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";

diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi
index 680c69c7b7387b294514bc8c698e4833e5abd97c..4b4b1c100b8ffb0c19fa25851ac638e2fb911990 100644 (file)
--- a/arch/arm/dts/fsl-lx2160a.dtsi
+++ b/arch/arm/dts/fsl-lx2160a.dtsi
@@ -134,7 +134,7 @@
                             <1 10 0x8>; /* Hypervisor PPI, active-low */
        };
 
-       fspi: flexspi@20c0000 {
+       fspi: spi@20c0000 {
                compatible = "nxp,lx2160a-fspi";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -221,7 +221,7 @@
                status = "disabled";
        };
 
-       dspi0: dspi@2100000 {
+       dspi0: spi@2100000 {
                compatible = "fsl,vf610-dspi";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -230,7 +230,7 @@
                spi-num-chipselects = <6>;
        };
 
-       dspi1: dspi@2110000 {
+       dspi1: spi@2110000 {
                compatible = "fsl,vf610-dspi";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -239,7 +239,7 @@
                spi-num-chipselects = <6>;
        };
 
-       dspi2: dspi@2120000 {
+       dspi2: spi@2120000 {
                compatible = "fsl,vf610-dspi";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/dts/fsl-lx2162a-qds.dts b/arch/arm/dts/fsl-lx2162a-qds.dts
index 0ca30df86202efd6ce5ae843d4c58a3ebc8d14cc..b333af6d63c16385cfcbcb0a9b3cdb019c29ef73 100644 (file)
--- a/arch/arm/dts/fsl-lx2162a-qds.dts
+++ b/arch/arm/dts/fsl-lx2162a-qds.dts
@@ -41,7 +41,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash0: n25q128a {
+       dflash0: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -50,7 +50,7 @@
                spi-cpha;
                reg = <0>;
        };
-       dflash1: sst25wf040b {
+       dflash1: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -59,7 +59,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash2: en25s64 {
+       dflash2: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -74,7 +74,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash3: n25q128a {
+       dflash3: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -83,7 +83,7 @@
                spi-cpha;
                reg = <0>;
        };
-       dflash4: sst25wf040b {
+       dflash4: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -92,7 +92,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash5: en25s64 {
+       dflash5: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -107,7 +107,7 @@
        bus-num = <0>;
        status = "okay";
 
-       dflash6: n25q128a {
+       dflash6: n25q128a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -116,7 +116,7 @@
                spi-cpha;
                reg = <0>;
        };
-       dflash7: sst25wf040b {
+       dflash7: sst25wf040b@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";
@@ -125,7 +125,7 @@
                spi-cpha;
                reg = <1>;
        };
-       dflash8: en25s64 {
+       dflash8: en25s64@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-flash";

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index 4f65ee765e3f228536c36ebca9315c17376483ff..005a40eff23d376f1042859b9757f37615a05369 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -205,7 +205,7 @@
                        clocks = <&sysclk>;
                };
 
-               dspi0: dspi@2100000 {
+               dspi0: spi@2100000 {
                        compatible = "fsl,vf610-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -218,7 +218,7 @@
                        status = "disabled";
                };
 
-               dspi1: dspi@2110000 {
+               dspi1: spi@2110000 {
                        compatible = "fsl,vf610-dspi";
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -231,7 +231,7 @@
                        status = "disabled";
                };
 
-               qspi: quadspi@1550000 {
+               qspi: spi@1550000 {
                        compatible = "fsl,ls1021a-qspi";
                        #address-cells = <1>;
                        #size-cells = <0>;