ARM: dts: imx: align SPI NOR node name with dtschema

[ Upstream commit ba9fe460dc2cfe90dc115b22af14dd3f13cffa0f ]

The node names should be generic and SPI NOR dtschema expects "flash".

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Stable-dep-of: af7d78c95701 ("ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 7e2b0f198dfadb801f350ee9282cc6c73bcea210..1053b7c584d81edec7fd257f7a38ebf9cdbe0add 100644 (file)
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -129,7 +129,7 @@ ssp2: spi@80014000 {
                                pinctrl-0 = <&spi2_pins_a>;
                                status = "okay";
 
-                               flash: m25p80@0 {
+                               flash: flash@0 {
                                        #address-cells = <1>;
                                        #size-cells = <1>;
                                        compatible = "sst,sst25vf016b", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index f3bddc5ada4b83f7bc39e4e260c6f4533fbf4d8c..13acdc7916b9b53196fa0524d321b486030d52d4 100644 (file)
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -33,7 +33,7 @@ ssp2: spi@80014000 {
                                pinctrl-0 = <&spi2_pins_a>;
                                status = "okay";
 
-                               flash: m25p80@0 {
+                               flash: flash@0 {
                                        #address-cells = <1>;
                                        #size-cells = <1>;
                                        compatible = "m25p80", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts
index 43be7a6a769bcb171ba164f1cbb5b4cf62bfb784..90928db0df7017892be048b533f64590ee67727c 100644 (file)
--- a/arch/arm/boot/dts/imx28-sps1.dts
+++ b/arch/arm/boot/dts/imx28-sps1.dts
@@ -51,7 +51,7 @@ ssp2: spi@80014000 {
                                pinctrl-0 = <&spi2_pins_a>;
                                status = "okay";
 
-                               flash: m25p80@0 {
+                               flash: flash@0 {
                                        #address-cells = <1>;
                                        #size-cells = <1>;
                                        compatible = "everspin,mr25h256", "mr25h256";

diff --git a/arch/arm/boot/dts/imx6dl-rex-basic.dts b/arch/arm/boot/dts/imx6dl-rex-basic.dts
index 0f1616bfa9a8087d86550fc0640f1d410362abc2..b72f8ea1e6f6cdcfa23170b2e00a06d39283bbd0 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-rex-basic.dts
+++ b/arch/arm/boot/dts/imx6dl-rex-basic.dts
@@ -19,7 +19,7 @@ memory@10000000 {
 };
 
 &ecspi3 {
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "sst,sst25vf016b", "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6q-ba16.dtsi b/arch/arm/boot/dts/imx6q-ba16.dtsi
index e4578ed3371ef27dcf2b9f0cecadb024b6aae92e..133991ca8c63319d1b315551d7317276f28ca899 100644 (file)
--- a/arch/arm/boot/dts/imx6q-ba16.dtsi
+++ b/arch/arm/boot/dts/imx6q-ba16.dtsi
@@ -139,7 +139,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: n25q032@0 {
+       flash: flash@0 {
                compatible = "jedec,spi-nor";
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx6q-bx50v3.dtsi b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
index 2a98cc657595f705cc48ee6c6fc06e5303f94636..66be04299cbf88e3e23e9a2aa31435972c3ee141 100644 (file)
--- a/arch/arm/boot/dts/imx6q-bx50v3.dtsi
+++ b/arch/arm/boot/dts/imx6q-bx50v3.dtsi
@@ -160,7 +160,7 @@ &ecspi5 {
        pinctrl-0 = <&pinctrl_ecspi5>;
        status = "okay";
 
-       m25_eeprom: m25p80@0 {
+       m25_eeprom: flash@0 {
                compatible = "atmel,at25";
                spi-max-frequency = <10000000>;
                size = <0x8000>;

diff --git a/arch/arm/boot/dts/imx6q-cm-fx6.dts b/arch/arm/boot/dts/imx6q-cm-fx6.dts
index bfb530f29d9deaaf1ee156ac5e6afd907b8e64d6..1ad41c944b4b9cc4d1449ce623d15bb5ef00fc38 100644 (file)
--- a/arch/arm/boot/dts/imx6q-cm-fx6.dts
+++ b/arch/arm/boot/dts/imx6q-cm-fx6.dts
@@ -260,7 +260,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
index fa2307d8ce8610aad082e38a8d5ad6b30666c45b..4dee1b22d5c1779bce4c3fb626d0e3d9320b499d 100644 (file)
--- a/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
+++ b/arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
@@ -102,7 +102,7 @@ &ecspi5 {
        cs-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "m25p80", "jedec,spi-nor";
                spi-max-frequency = <40000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6q-dms-ba16.dts b/arch/arm/boot/dts/imx6q-dms-ba16.dts
index 48fb47e715f6dfaa93b4702b301842539c39a988..137db38f0d27b1c7f9e6ebf218f2fa5924af9401 100644 (file)
--- a/arch/arm/boot/dts/imx6q-dms-ba16.dts
+++ b/arch/arm/boot/dts/imx6q-dms-ba16.dts
@@ -47,7 +47,7 @@ &ecspi5 {
        pinctrl-0 = <&pinctrl_ecspi5>;
        status = "okay";
 
-       m25_eeprom: m25p80@0 {
+       m25_eeprom: flash@0 {
                compatible = "atmel,at25256B", "atmel,at25";
                spi-max-frequency = <20000000>;
                size = <0x8000>;

diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 4cde45d5c90c80f52f32c13612892e205f043a71..e894faba571f964eb7608bd74f196c31f4f3b795 100644 (file)
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -137,7 +137,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "sst,w25q256", "jedec,spi-nor";
                spi-max-frequency = <30000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6q-marsboard.dts b/arch/arm/boot/dts/imx6q-marsboard.dts
index 05ee28388229037794d468c23c44a4b6903a771d..cc180100239427c8655014e120fe8ee730924e66 100644 (file)
--- a/arch/arm/boot/dts/imx6q-marsboard.dts
+++ b/arch/arm/boot/dts/imx6q-marsboard.dts
@@ -100,7 +100,7 @@ &ecspi1 {
        cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "microchip,sst25vf016b";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6q-rex-pro.dts b/arch/arm/boot/dts/imx6q-rex-pro.dts
index 1767e1a3cd53a498ef6672c0138a3bb98aad0127..271f4b2d9b9f0ae6364d30c6537902bd85532e43 100644 (file)
--- a/arch/arm/boot/dts/imx6q-rex-pro.dts
+++ b/arch/arm/boot/dts/imx6q-rex-pro.dts
@@ -19,7 +19,7 @@ memory@10000000 {
 };
 
 &ecspi3 {
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "sst,sst25vf032b", "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
index e21f6ac864e5492ad396074aed7dd916112ed6d3..baa197c90060e96163f9ed9d88cca1471f570a6e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
@@ -96,7 +96,7 @@ &ecspi4 {
        pinctrl-0 = <&pinctrl_ecspi4>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q128a11", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
index ead7ba27e10532fdfe2c74c465a3394f9fd298a0..ff8cb47fb9fdbe39c34b673d017a3ea28258a25b 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
@@ -131,7 +131,7 @@ &ecspi4 {
        pinctrl-0 = <&pinctrl_ecspi4>;
        status = "okay";
 
-       flash: m25p80@1 {
+       flash: flash@1 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q128a11", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
index 648f5fcb72e6545339b18a4288196c64a1a5e87c..2c1d6f28e6950678328b4826810f072eb89b1da8 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
@@ -35,7 +35,7 @@ &ecspi3 {
        pinctrl-0 = <&pinctrl_ecspi3>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "sst,sst25vf040b", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
index e9a4115124eb0ae518d425ab82e3c2eefc4e25ba..02ab8a59df23a31e7d758cc9e652a7f79a0ce34e 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
@@ -248,7 +248,7 @@ &ecspi4 {
        status = "okay";
 
        /* default boot source: workaround #1 for errata ERR006282 */
-       smarc_flash: spi-flash@0 {
+       smarc_flash: flash@0 {
                compatible = "winbond,w25q16dw", "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <20000000>;

diff --git a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
index d526f01a2c520705c50d0fc582a00831e7b55531..b7e74d859a96232e59d5fc62f33340d82360ac25 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
@@ -179,7 +179,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "microchip,sst25vf016b";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index a0917823c244f86234f835ee6a3f25c103f26d7b..a88323ac6c69688da75fdbc6a7e07d57765cbd1a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@ -321,7 +321,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "microchip,sst25vf016b";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
index 92d09a3ebe0ee5dcc306ceea265fff4f0dae6261..ee7e2371f94bd0f047936b70d6b941caf793d877 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
@@ -252,7 +252,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "microchip,sst25vf016b";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index 1243677b5f977fbff9ad7ef59d68fe3dd4cbb1d0..5adeb7aed2204cbcdb81466514cb5418c5b477c5 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -237,7 +237,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "sst,sst25vf016b", "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index afe477f3298462e1c278dc2a56b4667fee50b7a2..17535bf12516d5b809183a28a2f54269af744507 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -272,7 +272,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
        status = "disabled"; /* pin conflict with WEIM NOR */
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p32", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index fdc3aa9d544d3a98681dc6d9241eecc9752d6214..0aa1a0a28de0c4b3856d04f82330e6cad4227f8f 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -313,7 +313,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "sst,sst25vf016b", "jedec,spi-nor";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index f824c9abd11a363e977d1f527d0deac450d8d51c..758c62fb9cac1a93fbb2fa901c3550fea18947f7 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -194,7 +194,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p32", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 25f6f2fb1555ee1f62dcf45b1d813e0a9469e0c2..f16c830f1e9188d7877f937cfb71cdaeda099939 100644 (file)
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -137,7 +137,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "st,m25p32", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
index 66af78e83b7013e7af97790e0703f88aa96bb86b..a2c79bcf9a11c77d59671bacb4fc6d2ddb64da90 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
+++ b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
@@ -107,7 +107,7 @@ &ecspi1 {
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
-       flash: m25p80@0 {
+       flash: flash@0 {
                compatible = "microchip,sst25vf016b";
                spi-max-frequency = <20000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6sx-sdb-reva.dts
index dce5dcf96c25558ee34bc2492aa37bb50f95d310..7dda42553f4bce7db387d112b8dab738525628d9 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb-reva.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts
@@ -123,7 +123,7 @@ &qspi2 {
        pinctrl-0 = <&pinctrl_qspi2>;
        status = "okay";
 
-       flash0: s25fl128s@0 {
+       flash0: flash@0 {
                reg = <0>;
                #address-cells = <1>;
                #size-cells = <1>;
@@ -133,7 +133,7 @@ flash0: s25fl128s@0 {
                spi-tx-bus-width = <4>;
        };
 
-       flash1: s25fl128s@2 {
+       flash1: flash@2 {
                reg = <2>;
                #address-cells = <1>;
                #size-cells = <1>;

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index 5a63ca6157229ccc48d175f8045ef9446b203720..1b808563a536a68f47588d30f228787d09a003a1 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -108,7 +108,7 @@ &qspi2 {
        pinctrl-0 = <&pinctrl_qspi2>;
        status = "okay";
 
-       flash0: n25q256a@0 {
+       flash0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";
@@ -118,7 +118,7 @@ flash0: n25q256a@0 {
                reg = <0>;
        };
 
-       flash1: n25q256a@2 {
+       flash1: flash@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
index 64c2d1e9f7fce320557909cdfdc46703349abe30..71d3c7e05e08f29a7410054c66420009fca988cd 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
@@ -239,7 +239,7 @@ &qspi {
        pinctrl-0 = <&pinctrl_qspi>;
        status = "okay";
 
-       flash0: n25q256a@0 {
+       flash0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";

diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
index 47d3ce5d255fa9d92f7db9aa915114a16d062219..acd936540d898bf45c60defb7309b408a46e6a9e 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
@@ -19,7 +19,7 @@ memory@80000000 {
 };
 
 &qspi {
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-nand";

diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
index a095a7654ac65e58333532352ac9117804043beb..29ed38dce58021c7fdabf44d6e69fc4e8ecef83b 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
@@ -18,7 +18,7 @@ memory@80000000 {
 };
 
 &qspi {
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-nand";

diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
index 2a449a3c1ae27a93a613ed37a61b4d4339e871b3..09a83dbdf651059b603f3b5d0028d621625fcbed 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
+++ b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
@@ -19,7 +19,7 @@ &ecspi2 {
        pinctrl-0 = <&pinctrl_ecspi2>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "mxicy,mx25v8035f", "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                reg = <0>;

diff --git a/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi b/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
index b7e984284e1ad391829873699833aae35f73f451..d000606c07049a6ba8693650806c95edec087c6b 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
+++ b/arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
@@ -18,7 +18,7 @@ memory@80000000 {
 };
 
 &qspi {
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "spi-nand";