ARM: dts: imx31/imx6: Use flash as the NOR node name

According to mtd-physmap.yaml, 'nor' is not a valid node name.

Change it to 'flash' to fix the following dt-schema warning:

nor@0,0: $nodename:0: 'nor@0,0' does not match '^(flash|.*sram|nand)(@.*)?$'

Signed-off-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx31-lite.dts b/arch/arm/boot/dts/nxp/imx/imx31-lite.dts
index d17abdfb6330c1f6ea919f5d224c782e9df8267e..630f8fa69ba8771722c997156a203a0092ab192e 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx31-lite.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx31-lite.dts
@@ -157,7 +157,7 @@
 &weim {
        status = "okay";
 
-       nor@0,0 {
+       flash@0,0 {
                compatible = "cfi-flash";
                reg = <0 0x0 0x200000>;
                bank-width = <2>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-mccmon6.dts b/arch/arm/boot/dts/nxp/imx/imx6q-mccmon6.dts
index f08b3701029156b0e6e253cd2dac7ee8db8409bb..bba82126aaaa56642dffdbab4770b07cd87cefa5 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6q-mccmon6.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-mccmon6.dts
@@ -279,7 +279,7 @@
        ranges = <0 0 0x08000000 0x08000000>;
        status = "okay";
 
-       nor@0,0 {
+       flash@0,0 {
                compatible = "cfi-flash";
                reg = <0 0 0x02000000>;
                #address-cells = <1>;

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi
index a381cb224c1e2103d97216ae3ac7e99922a62767..2587d17c5918573cb103361234194a1b585b6548 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi
@@ -854,7 +854,7 @@
        ranges = <0 0 0x08000000 0x08000000>;
        status = "disabled"; /* pin conflict with SPI NOR */
 
-       nor@0,0 {
+       flash@0,0 {
                compatible = "cfi-flash";
                reg = <0 0 0x02000000>;
                #address-cells = <1>;