Commit 2e247989 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Jialin Zhang
Browse files

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

stable inclusion
from stable-v5.10.144
commit a381cac2ab080944893b096570dd4b324be87e26
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I6D0V7

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a381cac2ab080944893b096570dd4b324be87e26



--------------------------------

[ Upstream commit ba9fe460 ]

The node names should be generic and SPI NOR dtschema expects "flash".

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Stable-dep-of: af7d78c9 ("ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 8bc0f408

arch/arm/boot/dts/imx28-evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "sst,sst25vf016b", "jedec,spi-nor";

arch/arm/boot/dts/imx28-m28evk.dts

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "m25p80", "jedec,spi-nor";

arch/arm/boot/dts/imx28-sps1.dts

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
				pinctrl-0 = <&spi2_pins_a>;

				status = "okay";



				flash: m25p80@0 {

				flash: flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "everspin,mr25h256", "mr25h256";

arch/arm/boot/dts/imx6dl-rex-basic.dts

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
};



&ecspi3 {

	flash: m25p80@0 {

	flash: flash@0 {

		compatible = "sst,sst25vf016b", "jedec,spi-nor";

		spi-max-frequency = <20000000>;

		reg = <0>;

arch/arm/boot/dts/imx6q-ba16.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ 
	pinctrl-0 = <&pinctrl_ecspi1>;

	status = "okay";



	flash: n25q032@0 {

	flash: flash@0 {

		compatible = "jedec,spi-nor";

		#address-cells = <1>;

		#size-cells = <1>;