Skip to contentSkip to conversation

ARM: dts: imx6q-cm-fx6: Remove invalid SPI flash entry

PATCH Applied Fabio Estevam 2 participants 4 messages Jul 31, 2023 – Aug 6, 2023

Subsystems (2)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/3 ARM: dts: imx6q-cm-fx6: Remove invalid SPI flash entry

From: Fabio Estevam <[email protected]>

"st,m25p" is not a valid compatible according to jedec,spi-nor.yaml.

Remove it.

---
 arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts +1 -1
index ffb3b8eeae5d..95b49fc83f7b 100644
@@ -263,7 +263,7 @@ &ecspi1 {
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "st,m25p", "jedec,spi-nor";
+		compatible = "jedec,spi-nor";
 		spi-max-frequency = <20000000>;
 		reg = <0>;
 	};
Signature · 1 line
2.34.1
author reviewer
#1 lore raw

PATCH 2/3 ARM: dts: imx50-evk: Use generic node name for SPI NOR flash

From: Fabio Estevam <[email protected]>

Node names should be generic, so use 'flash' as the SPI NOR flash node name.

This fixes the following schema warning:

imx53-smd.dtb: m25p32@1: $nodename:0: 'm25p32@1' does not match '^(flash|.*sram|nand)(@.*)?$'
from schema $id: http://devicetree.org/schemas/mtd/jedec,spi-nor.yaml#

---
 arch/arm/boot/dts/nxp/imx/imx50-evk.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/nxp/imx/imx50-evk.dts +1 -1
index 4ea5c23f181b..3f45c01d9cce 100644
@@ -23,7 +23,7 @@ &cspi {
 	cs-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>, <&gpio4 13 GPIO_ACTIVE_LOW>;
 	status = "okay";
 
-	flash: m25p32@1 {
+	flash: flash@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "m25p32", "jedec,spi-nor";
Signature · 1 line
2.34.1
author reviewer
#2 lore raw

PATCH 3/3 ARM: dts: imx53-smd: Remove invalid SPI flash entry

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

"st,m25p" is not a valid compatible according to jedec,spi-nor.yaml.

Remove it.

Also, node names should be generic, so use 'flash' as the SPI NOR flash node name.

---
 arch/arm/boot/dts/nxp/imx/imx53-smd.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/nxp/imx/imx53-smd.dts +2 -2
index f8d17967a67e..55435dfdff8a 100644
@@ -67,10 +67,10 @@ zigbee: mc1323@0 {
 		reg = <0>;
 	};
 
-	flash: m25p32@1 {
+	flash: flash@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "st,m25p32", "st,m25p", "jedec,spi-nor";
+		compatible = "st,m25p32", "jedec,spi-nor";
 		spi-max-frequency = <20000000>;
 		reg = <1>;
 
Signature · 1 line
2.34.1