[PATCH v2 3/3] ARM: dts: imx: move NAND properties under nand at 0 node
Frank Li
Frank.Li at nxp.com
Fri Feb 13 09:08:27 PST 2026
Move NAND flash properties under the nand at 0 node and place partition
properties under the partitions node.
Fix below CHECK_DTBS warnings:
arch/arm/boot/dts/nxp/imx/imx27-apf27.dtb: nand-controller at d8000000 (fsl,imx27-nand): Unevaluated properties are not allowed ('#address-cells', '#size-cells', 'clocks', 'nand-bus-width', 'nand-ecc-mode', 'nand-on-flash-bbt', 'partition at 0', 'partition at 100000', 'partition at 180000', 'partition at 200000', 'partition at 280000', 'partition at 300000', 'partition at 800000' were unexpected)
from schema $id: http://devicetree.org/schemas/mtd/mxc-nand.yaml
Reviewed-by: Miquel Raynal <miquel.raynal at bootlin.com>
Signed-off-by: Frank Li <Frank.Li at nxp.com>
---
.../boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi | 10 ++-
arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts | 10 ++-
arch/arm/boot/dts/nxp/imx/imx25-pdk.dts | 6 +-
arch/arm/boot/dts/nxp/imx/imx27-apf27.dts | 82 ++++++++++++----------
.../boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi | 10 ++-
arch/arm/boot/dts/nxp/imx/imx27-pdk.dts | 8 ++-
.../dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi | 10 ++-
.../boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi | 10 ++-
8 files changed, 92 insertions(+), 54 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi b/arch/arm/boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi
index 31dc2a6403628db1527a1707460afbf9de893abd..29a7f99842e3a70c5dc7ce70c547afce2ed73f9f 100644
--- a/arch/arm/boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi
@@ -57,8 +57,12 @@ MX25_PAD_I2C1_DAT__I2C1_DAT 0x80000000
};
&nfc {
- nand-bus-width = <8>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
status = "okay";
+
+ nand at 0 {
+ reg = <0>;
+ nand-bus-width = <8>;
+ nand-ecc-mode = "hw";
+ nand-on-flash-bbt;
+ };
};
diff --git a/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts b/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts
index 458b94d3d4ed4c97adc5b9f2597698f22edb9350..7fd8656f529b1a9f3a4cacc68fe63ad0f23571dc 100644
--- a/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts
@@ -94,8 +94,12 @@ &fec {
&nfc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nfc>;
- nand-on-flash-bbt;
- nand-ecc-mode = "hw";
- nand-bus-width = <8>;
status = "okay";
+
+ nand at 0 {
+ reg = <0>;
+ nand-on-flash-bbt;
+ nand-ecc-mode = "hw";
+ nand-bus-width = <8>;
+ };
};
diff --git a/arch/arm/boot/dts/nxp/imx/imx25-pdk.dts b/arch/arm/boot/dts/nxp/imx/imx25-pdk.dts
index a35778ba6ffa0474d67f77005dfa4299b27d947c..04183ee7ff6851fc26874a640002bf702fe7aa07 100644
--- a/arch/arm/boot/dts/nxp/imx/imx25-pdk.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx25-pdk.dts
@@ -245,8 +245,12 @@ &lcdc {
};
&nfc {
- nand-on-flash-bbt;
status = "okay";
+
+ nand at 0 {
+ reg = <0>;
+ nand-on-flash-bbt;
+ };
};
&kpp {
diff --git a/arch/arm/boot/dts/nxp/imx/imx27-apf27.dts b/arch/arm/boot/dts/nxp/imx/imx27-apf27.dts
index b67bb21af3dedf1124ccdff6a1ac3ef703a6e22d..a61b0afa958ad304338192d8b8eb76a5c2004e3a 100644
--- a/arch/arm/boot/dts/nxp/imx/imx27-apf27.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx27-apf27.dts
@@ -69,42 +69,52 @@ &fec {
&nfc {
status = "okay";
- nand-bus-width = <16>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
- partition at 0 {
- label = "u-boot";
- reg = <0x0 0x100000>;
- };
-
- partition at 100000 {
- label = "env";
- reg = <0x100000 0x80000>;
- };
-
- partition at 180000 {
- label = "env2";
- reg = <0x180000 0x80000>;
- };
-
- partition at 200000 {
- label = "firmware";
- reg = <0x200000 0x80000>;
- };
-
- partition at 280000 {
- label = "dtb";
- reg = <0x280000 0x80000>;
- };
-
- partition at 300000 {
- label = "kernel";
- reg = <0x300000 0x500000>;
- };
-
- partition at 800000 {
- label = "rootfs";
- reg = <0x800000 0xf800000>;
+ nand at 0 {
+ reg = <0>;
+ nand-bus-width = <16>;
+ nand-ecc-mode = "hw";
+ nand-on-flash-bbt;
+
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0 0x100000>;
+ };
+
+ partition at 100000 {
+ label = "env";
+ reg = <0x100000 0x80000>;
+ };
+
+ partition at 180000 {
+ label = "env2";
+ reg = <0x180000 0x80000>;
+ };
+
+ partition at 200000 {
+ label = "firmware";
+ reg = <0x200000 0x80000>;
+ };
+
+ partition at 280000 {
+ label = "dtb";
+ reg = <0x280000 0x80000>;
+ };
+
+ partition at 300000 {
+ label = "kernel";
+ reg = <0x300000 0x500000>;
+ };
+
+ partition at 800000 {
+ label = "rootfs";
+ reg = <0x800000 0xf800000>;
+ };
+ };
};
};
diff --git a/arch/arm/boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi b/arch/arm/boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi
index 3df70ed6056c4d122c83f9d6dd1ec1af3c64ff0b..bc28250df7a7fb729c2ef76b1f4b3c1199e7f1ba 100644
--- a/arch/arm/boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi
@@ -42,10 +42,14 @@ rtc at 51 {
&nfc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nfc>;
- nand-bus-width = <8>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
status = "okay";
+
+ nand at 0 {
+ reg = <0>;
+ nand-bus-width = <8>;
+ nand-ecc-mode = "hw";
+ nand-on-flash-bbt;
+ };
};
&owire {
diff --git a/arch/arm/boot/dts/nxp/imx/imx27-pdk.dts b/arch/arm/boot/dts/nxp/imx/imx27-pdk.dts
index 2fc4ea5b9501f4765624b42f8badf013fbcdad6f..a1e3b387ba8ee290746fb094903989366a9968fb 100644
--- a/arch/arm/boot/dts/nxp/imx/imx27-pdk.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx27-pdk.dts
@@ -88,9 +88,13 @@ MATRIX_KEY(2, 3, KEY_F10)
&nfc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
status = "okay";
+
+ nand at 0 {
+ reg = <0>;
+ nand-ecc-mode = "hw";
+ nand-on-flash-bbt;
+ };
};
&uart1 {
diff --git a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi
index 2f60b3809f39b2f2c92cdb6a61664103380e3478..ba6cf03b60057af41f291a2c760efeeecf064301 100644
--- a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi
@@ -150,10 +150,14 @@ MX27_PAD_USBH2_DATA7__USBH2_DATA7 0x0
&nfc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nfc>;
- nand-bus-width = <8>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
status = "okay";
+
+ nand at 0 {
+ reg = <0>;
+ nand-bus-width = <8>;
+ nand-ecc-mode = "hw";
+ nand-on-flash-bbt;
+ };
};
&usbotg {
diff --git a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi
index 7d5d24c781b9834dbf8834c798b923829fd98444..cfa833cf0c114d987821ec563c7af5053b153a62 100644
--- a/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi
@@ -280,10 +280,14 @@ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
&nfc {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nfc>;
- nand-bus-width = <8>;
- nand-ecc-mode = "hw";
- nand-on-flash-bbt;
status = "okay";
+
+ nand at 0 {
+ reg = <0>;
+ nand-bus-width = <8>;
+ nand-ecc-mode = "hw";
+ nand-on-flash-bbt;
+ };
};
&ssi1 {
--
2.43.0
More information about the linux-arm-kernel
mailing list