[PATCH 2/2] arm64: dts: meson: align SPI NOR node name with dtschema

[Neil Armstrong]

On 07/04/2022 16:21, Krzysztof Kozlowski wrote:
> The node names should be generic and SPI NOR dtschema expects "flash".
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski at linaro.org>
> ---
>   arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi          | 2 +-
>   arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts    | 2 +-
>   arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 2 +-
>   arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts           | 2 +-
>   arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi              | 2 +-
>   arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts            | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
> index 2d7032f41e4b..bcdf55f48a83 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi
> @@ -416,7 +416,7 @@ &spifc {
>   	pinctrl-names = "default";
>   	status = "okay";
>   
> -	gd25lq128: spi-flash at 0 {
> +	gd25lq128: flash at 0 {
>   		compatible = "jedec,spi-nor";
>   		#address-cells = <1>;
>   		#size-cells = <1>;
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
> index 2d769203f671..213a0705ebdc 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
> @@ -298,7 +298,7 @@ &spifc {
>   	pinctrl-0 = <&nor_pins>;
>   	pinctrl-names = "default";
>   
> -	w25q32: spi-flash at 0 {
> +	w25q32: flash at 0 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "jedec,spi-nor";
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
> index 93d8f8aff70d..874f91c348ec 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
> @@ -284,7 +284,7 @@ &spifc {
>   	pinctrl-0 = <&nor_pins>;
>   	pinctrl-names = "default";
>   
> -	nor_4u1: spi-flash at 0 {
> +	nor_4u1: flash at 0 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "jedec,spi-nor";
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> index 86bdc0baf032..f43c45daf7eb 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts
> @@ -374,7 +374,7 @@ &spifc {
>   	pinctrl-0 = <&nor_pins>;
>   	pinctrl-names = "default";
>   
> -	w25q32: spi-flash at 0 {
> +	w25q32: flash at 0 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "winbond,w25q16", "jedec,spi-nor";
> diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
> index 3cf4ecb6d52e..c9705941e4ab 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi
> @@ -458,7 +458,7 @@ &spifc {
>   	pinctrl-0 = <&nor_pins>;
>   	pinctrl-names = "default";
>   
> -	w25q128: spi-flash at 0 {
> +	w25q128: flash at 0 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "winbond,w25q128fw", "jedec,spi-nor";
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
> index f3f953225bf5..e3486f60645a 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts
> @@ -121,7 +121,7 @@ &spifc {
>   	pinctrl-0 = <&nor_pins>;
>   	pinctrl-names = "default";
>   
> -	spi-flash at 0 {
> +	flash at 0 {
>   		#address-cells = <1>;
>   		#size-cells = <1>;
>   		compatible = "jedec,spi-nor";

Reviewed-by: Neil Armstrong <narmstrong at baylibre.com>