ARM: dts: at91: use generic node name for dataflash

The node names should be generic, so use "flash" for dataflash nodes and
for cfi-flash.

Suggested-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20220412105013.249793-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>

diff --git a/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt b/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
index 692300117c647c2a78abd3da8140e62d1d08c897..9d837535637b467aad496642d8f764b7106e6842 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
+++ b/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
@@ -54,7 +54,7 @@ flexcom@f8034000 {
                clock-names = "spi_clk";
                atmel,fifo-size = <32>;
 
-               mtd_dataflash@0 {
+               flash@0 {
                        compatible = "atmel,at25f512b";
                        reg = <0>;
                        spi-max-frequency = <20000000>;

diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
index e1ef4e44e663d2c7c794dc54e48138ba60922017..4624a6f076f8155f329bb9eb0e3cbe59ee3e3d6a 100644 (file)
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/at91rm9200ek.dts
@@ -73,7 +73,7 @@ &pinctrl_uart1_dcd
                        spi0: spi@fffe0000 {
                                status = "okay";
                                cs-gpios = <&pioA 3 0>, <0>, <0>, <0>;
-                               mtd_dataflash@0 {
+                               flash@0 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        spi-max-frequency = <15000000>;
                                        reg = <0>;
@@ -94,7 +94,7 @@ usb0: ohci@300000 {
                        status = "okay";
                };
 
-               nor_flash@10000000 {
+               flash@10000000 {
                        compatible = "cfi-flash";
                        reg = <0x10000000 0x800000>;
                        linux,mtd-name = "physmap-flash.0";

diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sam9260ek.dts
index ce96345d28a396e6fb2a76ed1a39e6b5d1e03387..6381088ba24f3ef440264c58f8d17741872ca9f7 100644 (file)
--- a/arch/arm/boot/dts/at91sam9260ek.dts
+++ b/arch/arm/boot/dts/at91sam9260ek.dts
@@ -92,7 +92,7 @@ macb0: ethernet@fffc4000 {
 
                        spi0: spi@fffc8000 {
                                cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
-                               mtd_dataflash@1 {
+                               flash@1 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        spi-max-frequency = <50000000>;
                                        reg = <1>;

diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index beed819609e8d365add7df4cbf1af61f39354ed2..8f11c0b7d76d7bca38f274d3743fbc0ed7819b4f 100644 (file)
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -145,7 +145,7 @@ spi0: spi@fffc8000 {
                                cs-gpios = <&pioA 3 0>, <0>, <&pioA 28 0>, <0>;
                                status = "okay";
 
-                               mtd_dataflash@0 {
+                               flash@0 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        reg = <0>;
                                        spi-max-frequency = <15000000>;

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 71f60576761a0cc35519582a7c6f18e8074d48cb..42e7340202355caca30666fd1202433ec816bd68 100644 (file)
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -95,7 +95,7 @@ pinctrl_board_mmc0: mmc0-board {
                        spi0: spi@fffa4000 {
                                status = "okay";
                                cs-gpios = <&pioA 5 0>, <0>, <0>, <0>;
-                               mtd_dataflash@0 {
+                               flash@0 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        spi-max-frequency = <50000000>;
                                        reg = <0>;

diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index 87bb39060e8becd02c140e5d5effde8fef8295f0..74b90dc58cbfc07ec09bc672e68498b8e96327d5 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -110,7 +110,7 @@ ssc0: ssc@fffbc000 {
 
                        spi0: spi@fffc8000 {
                                cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
-                               mtd_dataflash@1 {
+                               flash@1 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        spi-max-frequency = <50000000>;
                                        reg = <1>;

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index b6256a20fbc78421b132fb719969dc40a7f5980c..e5db198a87a85e816f00bf460c2655f23c7f1912 100644 (file)
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -167,7 +167,7 @@ pinctrl_pwm_leds: pwm-led {
                        spi0: spi@fffa4000{
                                status = "okay";
                                cs-gpios = <&pioB 3 0>, <0>, <0>, <0>;
-                               mtd_dataflash@0 {
+                               flash@0 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        spi-max-frequency = <13000000>;
                                        reg = <0>;

diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index 62981b39c8159255400a8de1292857bf60da994a..d74b8d9d84aa41473889e8c3bd3f4c6c6a68559a 100644 (file)
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -180,7 +180,7 @@ usb0: gadget@fffd4000 {
                        spi0: spi@fffcc000 {
                                status = "okay";
                                cs-gpios = <&pioA 28 0>, <0>, <0>, <0>;
-                               mtd_dataflash@0 {
+                               flash@0 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        spi-max-frequency = <15000000>;
                                        reg = <0>;

diff --git a/arch/arm/boot/dts/usb_a9263.dts b/arch/arm/boot/dts/usb_a9263.dts
index 8a0cfbfd0c452bc5e37b0c8dc9b61d7bf0633cb1..b6cb9cdf8197336112c8b160d22d97c6fde8b30b 100644 (file)
--- a/arch/arm/boot/dts/usb_a9263.dts
+++ b/arch/arm/boot/dts/usb_a9263.dts
@@ -60,7 +60,7 @@ usb1: gadget@fff78000 {
                        spi0: spi@fffa4000 {
                                cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>;
                                status = "okay";
-                               mtd_dataflash@0 {
+                               flash@0 {
                                        compatible = "atmel,at45", "atmel,dataflash";
                                        reg = <0>;
                                        spi-max-frequency = <15000000>;