[PATCH] ARM: dts: at91: use generic node name for dataflash
Nicolas Ferre
nicolas.ferre at microchip.com
Wed Apr 13 02:24:21 PDT 2022
On 12/04/2022 at 12:50, Krzysztof Kozlowski wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> The node names should be generic, so use "flash" for dataflash nodes and
> for cfi-flash.
>
> Suggested-by: Tudor Ambarus <tudor.ambarus at microchip.com>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
Acked-by: Nicolas Ferre <nicolas.ferre at microchip.com>
and queued in "fixes" branch for 5.18 as it can save us some error while
checking DT.
Best regards,
Nicolas
> ---
> Documentation/devicetree/bindings/mfd/atmel-flexcom.txt | 2 +-
> arch/arm/boot/dts/at91rm9200ek.dts | 4 ++--
> arch/arm/boot/dts/at91sam9260ek.dts | 2 +-
> arch/arm/boot/dts/at91sam9261ek.dts | 2 +-
> arch/arm/boot/dts/at91sam9263ek.dts | 2 +-
> arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 2 +-
> arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +-
> arch/arm/boot/dts/at91sam9rlek.dts | 2 +-
> arch/arm/boot/dts/usb_a9263.dts | 2 +-
> 9 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt b/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
> index 692300117c64..9d837535637b 100644
> --- a/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
> +++ b/Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
> @@ -54,7 +54,7 @@ flexcom at f8034000 {
> clock-names = "spi_clk";
> atmel,fifo-size = <32>;
>
> - mtd_dataflash at 0 {
> + flash at 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 e1ef4e44e663..4624a6f076f8 100644
> --- a/arch/arm/boot/dts/at91rm9200ek.dts
> +++ b/arch/arm/boot/dts/at91rm9200ek.dts
> @@ -73,7 +73,7 @@ &pinctrl_uart1_dcd
> spi0: spi at fffe0000 {
> status = "okay";
> cs-gpios = <&pioA 3 0>, <0>, <0>, <0>;
> - mtd_dataflash at 0 {
> + flash at 0 {
> compatible = "atmel,at45", "atmel,dataflash";
> spi-max-frequency = <15000000>;
> reg = <0>;
> @@ -94,7 +94,7 @@ usb0: ohci at 300000 {
> status = "okay";
> };
>
> - nor_flash at 10000000 {
> + flash at 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 ce96345d28a3..6381088ba24f 100644
> --- a/arch/arm/boot/dts/at91sam9260ek.dts
> +++ b/arch/arm/boot/dts/at91sam9260ek.dts
> @@ -92,7 +92,7 @@ macb0: ethernet at fffc4000 {
>
> spi0: spi at fffc8000 {
> cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
> - mtd_dataflash at 1 {
> + flash at 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 beed819609e8..8f11c0b7d76d 100644
> --- a/arch/arm/boot/dts/at91sam9261ek.dts
> +++ b/arch/arm/boot/dts/at91sam9261ek.dts
> @@ -145,7 +145,7 @@ spi0: spi at fffc8000 {
> cs-gpios = <&pioA 3 0>, <0>, <&pioA 28 0>, <0>;
> status = "okay";
>
> - mtd_dataflash at 0 {
> + flash at 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 71f60576761a..42e734020235 100644
> --- 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 at fffa4000 {
> status = "okay";
> cs-gpios = <&pioA 5 0>, <0>, <0>, <0>;
> - mtd_dataflash at 0 {
> + flash at 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 87bb39060e8b..74b90dc58cbf 100644
> --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
> +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
> @@ -110,7 +110,7 @@ ssc0: ssc at fffbc000 {
>
> spi0: spi at fffc8000 {
> cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
> - mtd_dataflash at 1 {
> + flash at 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 b6256a20fbc7..e5db198a87a8 100644
> --- 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 at fffa4000{
> status = "okay";
> cs-gpios = <&pioB 3 0>, <0>, <0>, <0>;
> - mtd_dataflash at 0 {
> + flash at 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 62981b39c815..d74b8d9d84aa 100644
> --- a/arch/arm/boot/dts/at91sam9rlek.dts
> +++ b/arch/arm/boot/dts/at91sam9rlek.dts
> @@ -180,7 +180,7 @@ usb0: gadget at fffd4000 {
> spi0: spi at fffcc000 {
> status = "okay";
> cs-gpios = <&pioA 28 0>, <0>, <0>, <0>;
> - mtd_dataflash at 0 {
> + flash at 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 8a0cfbfd0c45..b6cb9cdf8197 100644
> --- a/arch/arm/boot/dts/usb_a9263.dts
> +++ b/arch/arm/boot/dts/usb_a9263.dts
> @@ -60,7 +60,7 @@ usb1: gadget at fff78000 {
> spi0: spi at fffa4000 {
> cs-gpios = <&pioB 15 GPIO_ACTIVE_HIGH>;
> status = "okay";
> - mtd_dataflash at 0 {
> + flash at 0 {
> compatible = "atmel,at45", "atmel,dataflash";
> reg = <0>;
> spi-max-frequency = <15000000>;
> --
> 2.32.0
>
--
Nicolas Ferre
More information about the linux-arm-kernel
mailing list