Re: [PATCH] Revert "ARM: dts: imx: move nand related property under nand@0"

Frank Li
2026-03-05T20:05:57Z

On Mon, Mar 02, 2026 at 10:49:28AM -0500, Frank Li wrote:
> On Mon, Mar 02, 2026 at 11:53:00AM +0100, Max Krummenacher wrote:
> > for our NAND-based modules, and our CI no longer produces any useful
> > results as a consequence.
> >
> > I strongly believe that, as an immediate first step, the commit
> > that moved the DT NAND chip configuration into its subnode should
> > be reverted.
>
> As my previous said, can do partial revert? Just add back property under
> gpmi and keep nand@0 node.
>
> For example
>
> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
> +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
> @@ -260,14 +260,10 @@ fixed-link {
> &gpmi {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_gpmi_nand>;
> + nand-on-flash-bbt;
> #address-cells = <1>;
> #size-cells = <0>;
> status = "okay";
>
> Remove "- nand@0" part. You can use "git add -p" to do that.

Do you plan rework this patch as what I said?

Frank

>
> Frank
>
>
> >
> > Regards
> > Max
> >
> > >
> > > I plan give additional 1 year to do transistion. This type layout actually
> > > exist for long time.
> > >
> > > Frank
> > >
> > > >
> > > > Regards
> > > > Max
> > > >
> > > > >
> > > > > Frank
> > > > > >
> > > > > > Regards,
> > > > > > Max
> > > > > >
> > > > > > >
> > > > > > > diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> > > > > > > index 51f595fbc834e..fb126a7c4a61e 100644
> > > > > > > --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> > > > > > > +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
> > > > > > > @@ -2680,6 +2680,7 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
> > > > > > > {
> > > > > > > struct nand_chip *chip = &this->nand;
> > > > > > > struct mtd_info *mtd = nand_to_mtd(chip);
> > > > > > > + struct device_node *np;
> > > > > > > int ret;
> > > > > > >
> > > > > > > /* init the MTD data structures */
> > > > > > > @@ -2688,7 +2689,10 @@ static int gpmi_nand_init(struct gpmi_nand_data *this)
> > > > > > >
> > > > > > > /* init the nand_chip{}, we don't support a 16-bit NAND Flash bus. */
> > > > > > > nand_set_controller_data(chip, this);
> > > > > > > - nand_set_flash_node(chip, this->pdev->dev.of_node);
> > > > > > > + np = of_get_next_child(this->pdev->dev.of_node, NULL);
> > > > > > > + if (!np)
> > > > > > > + np = this->pdev->dev.of_node;
> > > > > > > + nand_set_flash_node(chip, np);
> > > > > > > chip->legacy.block_markbad = gpmi_block_markbad;
> > > > > > > chip->badblock_pattern = &gpmi_bbt_descr;
> > > > > > > chip->options |= NAND_NO_SUBPAGE_WRITE;
> > > > > > >
> > > > > > > Frank
> > > > > > > >
> > > > > > > >
> > > > > > > > So I don't see a quick fix other than reverting and living with the
> > > > > > > > dtb_check warning.
> > > > > > > >
> > > > > > > > Regards,
> > > > > > > > Max
> > > > > > > >
> > > > > > > > > >
> > > > > > > > > > Fixes: 8124b4a4a96b ("ARM: dts: imx: move nand related property under nand@0")
> > > > > > > > > > Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
> > > > > > > > > >
> > > > > > > > > > ---
> > > > > > > > > >
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi | 6 +-----
> > > > > > > > > > .../boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi | 6 +-----
> > > > > > > > > > .../boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi | 12 ++++--------
> > > > > > > > > > .../boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi | 12 ++++--------
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts | 6 +-----
> > > > > > > > > > arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi | 8 ++------
> > > > > > > > > > 15 files changed, 22 insertions(+), 82 deletions(-)
> > > > > > > > > >
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi
> > > > > > > > > > index f452764fae00..547fb141ec0c 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi
> > > > > > > > > > @@ -36,12 +36,8 @@ &clks {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c3 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
> > > > > > > > > > index 58ecdb87c6d4..9975b6ee433d 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi
> > > > > > > > > > @@ -172,12 +172,8 @@ eth_phy: ethernet-phy@0 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c1 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
> > > > > > > > > > index 6f3becd33a5b..aa9a442852f4 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi
> > > > > > > > > > @@ -102,12 +102,8 @@ ethphy: ethernet-phy@0 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c1 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi
> > > > > > > > > > index f2140dd8525f..85e278eb2016 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi
> > > > > > > > > > @@ -73,12 +73,8 @@ ethphy: ethernet-phy@3 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "disabled";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c3 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
> > > > > > > > > > index 131a3428ddb8..c93dbc595ef6 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi
> > > > > > > > > > @@ -260,14 +260,10 @@ fixed-link {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > #address-cells = <1>;
> > > > > > > > > > #size-cells = <0>;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c3 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
> > > > > > > > > > index d29adfef5fdb..57297d6521cf 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi
> > > > > > > > > > @@ -252,13 +252,9 @@ etnphy: ethernet-phy@0 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > fsl,no-blockmark-swap;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c1 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts b/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
> > > > > > > > > > index 40d530c1dc29..2a6bb5ff808a 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts
> > > > > > > > > > @@ -133,12 +133,8 @@ ethphy1: ethernet-phy@1 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c1 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
> > > > > > > > > > index 776f6f78ee46..e34c8cbe36ae 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi
> > > > > > > > > > @@ -101,12 +101,8 @@ ethphy0: ethernet-phy@0 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "disabled";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c1 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi
> > > > > > > > > > index 27e4d2aec137..a3ea1b208462 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi
> > > > > > > > > > @@ -63,12 +63,8 @@ ethphy1: ethernet-phy@1 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "disabled";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c1 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
> > > > > > > > > > index dc53f9286ffe..1992dfb53b45 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi
> > > > > > > > > > @@ -296,13 +296,9 @@ &fec2 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > fsl,no-blockmark-swap;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &i2c2 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
> > > > > > > > > > index eaed2cbf0c82..ec3c1e7301f4 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi
> > > > > > > > > > @@ -160,15 +160,11 @@ &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > fsl,use-minimum-ecc;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > + nand-ecc-mode = "hw";
> > > > > > > > > > + nand-ecc-strength = <8>;
> > > > > > > > > > + nand-ecc-step-size = <512>;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - nand-ecc-mode = "hw";
> > > > > > > > > > - nand-ecc-strength = <8>;
> > > > > > > > > > - nand-ecc-step-size = <512>;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > /* I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board) */
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi
> > > > > > > > > > index 3dfd43b32055..43518bf07602 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi
> > > > > > > > > > @@ -43,15 +43,11 @@ ethphy0: ethernet-phy@0 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-ecc-mode = "hw";
> > > > > > > > > > + nand-ecc-strength = <0>;
> > > > > > > > > > + nand-ecc-step-size = <0>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-ecc-mode = "hw";
> > > > > > > > > > - nand-ecc-strength = <0>;
> > > > > > > > > > - nand-ecc-step-size = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &iomuxc {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi
> > > > > > > > > > index fc298f57bfff..83b9de17cee2 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi
> > > > > > > > > > @@ -60,12 +60,8 @@ ethphy0: ethernet-phy@0 {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "disabled";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &uart1 {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts b/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
> > > > > > > > > > index 8ec18eae98a4..2d9f495660c9 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts
> > > > > > > > > > @@ -25,12 +25,8 @@ usdhc2_pwrseq: usdhc2-pwrseq {
> > > > > > > > > > &gpmi {
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > status = "okay";
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > &snvs_poweroff {
> > > > > > > > > > diff --git a/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
> > > > > > > > > > index a41dc4edfc0d..8666dcd7fe97 100644
> > > > > > > > > > --- a/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
> > > > > > > > > > +++ b/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
> > > > > > > > > > @@ -375,14 +375,10 @@ &gpio7 {
> > > > > > > > > > /* NAND on such SKUs */
> > > > > > > > > > &gpmi {
> > > > > > > > > > fsl,use-minimum-ecc;
> > > > > > > > > > + nand-ecc-mode = "hw";
> > > > > > > > > > + nand-on-flash-bbt;
> > > > > > > > > > pinctrl-names = "default";
> > > > > > > > > > pinctrl-0 = <&pinctrl_gpmi_nand>;
> > > > > > > > > > -
> > > > > > > > > > - nand@0 {
> > > > > > > > > > - reg = <0>;
> > > > > > > > > > - nand-ecc-mode = "hw";
> > > > > > > > > > - nand-on-flash-bbt;
> > > > > > > > > > - };
> > > > > > > > > > };
> > > > > > > > > >
> > > > > > > > > > /* On-module Power I2C */
> > > > > > > > > > --
> > > > > > > > > > 2.42.0
> > > > > > > > > >