arm64: 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-2-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 3e5789f372069164fddd2ef2a078ad3cf5508e1f..bd4e61d5448eae3d02da0860e16db684620d2812 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -164,7 +164,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&spi_quad_pins>;
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <108000000>;

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
index 1cee26479bfecec78480ab73703067ed43d9e20a..d665f742a7d53230317339baa7b8261aa9ec84be 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -211,7 +211,7 @@
        assigned-clock-parents = <&tbg 1>;
        assigned-clock-rates = <20000000>;
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
index 95d46e8d081c191d8276be7fc5c21a7d8aaf740d..a4de8d00cf461818f36f31dc842e04adc9a4dda1 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
@@ -99,7 +99,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&spi_quad_pins>;
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <54000000>;

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
index cd326fe224ce9d13db7c0b9f50ff673da85241ab..5e5baf6beea462a6c3d9ebeb91f5ba88d04a2164 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts
@@ -83,7 +83,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -186,7 +186,7 @@
 &cp0_spi1 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0x0>;
                spi-max-frequency = <20000000>;

diff --git a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
index f3b0d57a24a333456b41af029a56d357a87380df..39a8e5e99d7999ab0d9ec9cd0382f80c9817292d 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+++ b/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
@@ -155,7 +155,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&cp0_spi1_pins>;
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
index 8729c6467303bf463642398d69f5a92893f8ae7e..871f84b4a6ed02dba8de7b24f13710b02742653b 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-clearfog-gt-8k.dts
@@ -589,7 +589,7 @@
        pinctrl-0 = <&cp1_spi1_pins>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "st,w25q32";
                spi-max-frequency = <50000000>;
                reg = <0>;

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
index f2e8e0df886541d19ebc3a1c6b1d06be284e4415..92897bd7e6cfd6130bbfba6b8356e2ae2d2dc5a8 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts
@@ -72,7 +72,7 @@
 &spi0 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -238,7 +238,7 @@
 &cp1_spi1 {
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0x0>;
                spi-max-frequency = <20000000>;

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
index adbfecc678b5c5d99c432d87bd94304ee10271e4..779cf167c33e2630207e96621d2f1ea614133698 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
@@ -360,7 +360,7 @@
        pinctrl-0 = <&cp1_spi1_pins>;
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                compatible = "st,w25q32";
                spi-max-frequency = <50000000>;
                reg = <0>;

diff --git a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
index dac85fa748debcd1b7209732d37b90dacea089f2..74bed79e4f5ed333764c3f1cd7aeff7e20d371da 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
+++ b/arch/arm64/boot/dts/marvell/armada-8040-puzzle-m801.dts
@@ -185,7 +185,7 @@
 
 &spi0 {
        status = "okay";
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <0x1>;
                #size-cells = <0x1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
index d9f9f2c1974087f6081ed5857c8906e10310bf54..1acd746284dc762c08623c9bdf4af54801e9bd36 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9130-crb.dtsi
@@ -175,7 +175,7 @@
              <0x2000000 0x1000000>;    /* CS0 */
        status = "okay";
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <0x1>;
                #size-cells = <0x1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
index c00b69b88bd2fd215d251eb3747ddff176ef1b59..7e20987253a381e46c60e2fbf82913a8b3b38580 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
@@ -310,7 +310,7 @@
        pinctrl-0 = <&cp0_spi0_pins>;
        reg = <0x700680 0x50>;
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <0x1>;
                #size-cells = <0x1>;
                compatible = "jedec,spi-nor";

diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
index f995b1bcda01fcf8da290358379c5fa1b4a597a5..b7fc241a228cc8d7bec50b2f7eb0350fafd9c50f 100644 (file)
--- a/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9131-db.dtsi
@@ -137,7 +137,7 @@
        pinctrl-0 = <&cp1_spi0_pins>;
        reg = <0x700680 0x50>;
 
-       spi-flash@0 {
+       flash@0 {
                #address-cells = <0x1>;
                #size-cells = <0x1>;
                compatible = "jedec,spi-nor";