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

The node names should be generic and SPI NOR dtschema expects "flash".
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220407143234.295426-1-krzysztof.kozlowski@linaro.org

arch/arm/boot/dts/armada-370-db.dts

@@ -203,7 +203,7 @@ &spi0 {
 	pinctrl-names = "default";
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "mx25l25635e", "jedec,spi-nor";

arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi

@@ -159,7 +159,7 @@ &spi0 {
 	pinctrl-0 = <&spi0_pins2>;
 	pinctrl-names = "default";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		/* MX25L8006E */

arch/arm/boot/dts/armada-370-synology-ds213j.dts

@@ -258,7 +258,7 @@ fan_alarm_pin: fan-alarm-pin {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "micron,n25q064", "jedec,spi-nor";

arch/arm/boot/dts/armada-375-db.dts

@@ -64,7 +64,7 @@ &spi0 {
 
 	status = "disabled";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "n25q128a13", "jedec,spi-nor";

arch/arm/boot/dts/armada-381-netgear-gs110emx.dts

@@ -242,7 +242,7 @@ &spi0 {
 	pinctrl-names = "default";
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-385-atl-x530.dts

@@ -168,7 +168,7 @@ &spi1 {
 	pinctrl-0 = <&spi1_pins>;
 	status = "okay";
 
-	spi-flash@1 {
+	flash@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-385-clearfog-gtr.dtsi

@@ -365,7 +365,7 @@ &spi1 {
 	pinctrl-names = "default";
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "w25q32", "jedec,spi-nor";

arch/arm/boot/dts/armada-385-db-88f6820-amc.dts

@@ -126,7 +126,7 @@ &spi1 {
 	pinctrl-0 = <&spi1_pins>;
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-385-db-ap.dts

@@ -192,7 +192,7 @@ &spi1 {
 	pinctrl-0 = <&spi1_pins>;
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "st,m25p128", "jedec,spi-nor";

arch/arm/boot/dts/armada-385-synology-ds116.dts

@@ -223,7 +223,7 @@ &spi0 {
 	pinctrl-0 = <&spi0_pins>;
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "macronix,mx25l6405d", "jedec,spi-nor";

arch/arm/boot/dts/armada-385-turris-omnia.dts

@@ -485,7 +485,7 @@ &spi0 {
 	pinctrl-0 = <&spi0_pins &spi0cs0_pins>;
 	status = "okay";
 
-	spi-nor@0 {
+	flash@0 {
 		compatible = "spansion,s25fl164k", "jedec,spi-nor";
 		#address-cells = <1>;
 		#size-cells = <1>;

arch/arm/boot/dts/armada-388-db.dts

@@ -133,7 +133,7 @@ pcie@2,0 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q32", "jedec,spi-nor";

arch/arm/boot/dts/armada-388-gp.dts

@@ -395,7 +395,7 @@ &spi0 {
 	pinctrl-0 = <&spi0_pins>;
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "st,m25p128", "jedec,spi-nor";

arch/arm/boot/dts/armada-388-rd.dts

@@ -97,7 +97,7 @@ pcie@1,0 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "st,m25p128", "jedec,spi-nor";

arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi

@@ -101,7 +101,7 @@ &spi1 {
 	/* The microsom has an optional W25Q32 on board, connected to CS0 */
 	pinctrl-0 = <&spi1_pins>;
 
-	w25q32: spi-flash@0 {
+	w25q32: flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q32", "jedec,spi-nor";

arch/arm/boot/dts/armada-390-db.dts

@@ -81,7 +81,7 @@ &spi1 {
 	pinctrl-0 = <&spi1_pins>;
 	pinctrl-names = "default";
 
-	spi-flash@1 {
+	flash@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "n25q128a13",

arch/arm/boot/dts/armada-398-db.dts

@@ -79,7 +79,7 @@ &spi1 {
 	pinctrl-0 = <&spi1_pins>;
 	pinctrl-names = "default";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <0>;
 		compatible = "n25q128a13", "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-axpwifiap.dts

@@ -134,7 +134,7 @@ phy_int_pin: phy-int-pin {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "n25q128a13", "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-crs305-1g-4s-bit.dts

@@ -15,7 +15,7 @@ / {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-crs305-1g-4s.dtsi

@@ -80,7 +80,7 @@ &usb0 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-crs326-24g-2s-bit.dts

@@ -15,7 +15,7 @@ / {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-crs326-24g-2s.dtsi

@@ -80,7 +80,7 @@ &usb0 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s-bit.dts

@@ -15,7 +15,7 @@ / {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-crs328-4c-20s-4s.dtsi

@@ -80,7 +80,7 @@ &usb0 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-db-dxbc2.dts

@@ -93,7 +93,7 @@ &sdio {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "m25p64";

arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts

@@ -89,7 +89,7 @@ nand@0 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "m25p64";

arch/arm/boot/dts/armada-xp-db.dts

@@ -235,7 +235,7 @@ phy3: ethernet-phy@3 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "m25p64", "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-gp.dts

@@ -220,7 +220,7 @@ phy3: ethernet-phy@3 {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "n25q128a13", "jedec,spi-nor";

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

@@ -255,7 +255,7 @@ gpio_fan_pin: gpio-fan-pin {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "everspin,mr25h256";

arch/arm/boot/dts/armada-xp-synology-ds414.dts

@@ -274,7 +274,7 @@ fan2_alarm_pin: fan2-alarm-pin {
 &spi0 {
 	status = "okay";
 
-	spi-flash@0 {
+	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "micron,n25q064", "jedec,spi-nor";

arch/arm/boot/dts/dove-cubox.dts

@@ -127,7 +127,7 @@ &spi0 {
 	status = "okay";
 
 	/* spi0.0: 4M Flash Winbond W25Q32BV */
-	spi-flash@0 {
+	flash@0 {
 		compatible = "st,w25q32";
 		spi-max-frequency = <20000000>;
 		reg = <0>;

arch/arm/boot/dts/dove-d2plug.dts

@@ -62,7 +62,7 @@ &spi0 {
 	status = "okay";
 
 	/* spi0.0: 4M Flash Macronix MX25L3205D */
-	spi-flash@0 {
+	flash@0 {
 		compatible = "st,m25l3205d";
 		spi-max-frequency = <20000000>;
 		reg = <0>;

arch/arm/boot/dts/dove-d3plug.dts

@@ -79,7 +79,7 @@ &spi0 {
 	status = "okay";
 
 	/* spi0.0: 2M Flash Macronix MX25L1605D */
-	spi-flash@0 {
+	flash@0 {
 		compatible = "st,m25l1605d";
 		spi-max-frequency = <86000000>;
 		reg = <0>;

arch/arm/boot/dts/dove-dove-db.dts

@@ -27,7 +27,7 @@ &spi0 {
 	status = "okay";
 
 	/* spi0.0: 4M Flash ST-M25P32-VMF6P */
-	spi-flash@0 {
+	flash@0 {
 		compatible = "st,m25p32";
 		spi-max-frequency = <20000000>;
 		reg = <0>;

arch/arm/boot/dts/kirkwood-dir665.dts

@@ -78,7 +78,7 @@ pmx_btn_wps: pmx-btn-wps {
 
 		spi@10600 {
 			status = "okay";
-			m25p80@0 {
+			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
 				compatible = "mxicy,mx25l12805d", "jedec,spi-nor";

arch/arm/boot/dts/kirkwood-synology.dtsi

@@ -198,7 +198,7 @@ rtc@10300 {
 		spi@10600 {
 			status = "okay";
 
-			m25p80@0 {
+			flash@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
 				compatible = "st,m25p80", "jedec,spi-nor";