From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 78C142C21D3 for ; Thu, 19 Feb 2026 17:06:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771520797; cv=none; b=M+tD71ljFVIGzBRYCX7+hePzvlVMPBxZVPHbPgp7g4rF9KtapmxStA+MBJ0+LfsJrao+bNjDCvkmQWGumfaDVtjAPzdewldlhrKF5JoQd4gdaqF+UnkzQgO6GsMxjjAC8PhzvGD6zVvLIsnQ3sJfGpckvJFxLQWn4atAesDWZg0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771520797; c=relaxed/simple; bh=UeQyfBVnOjo6PM5pXAben29smqszODqM5VqXQ9oksvQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=OcZ6nk/Hqv5M2JbbJsfC9NrFs9RAj2UkAdC1tW9ZW5/1AVUYmMDHVH6gjp6Za0/BHR3TTXQEwNAsAYcFgOhyNaPMVrdFNW6xttEzPITtQxBoFDx9Fob3t+Z09U9aJ2Q8MNxlp69+e0Vp9X5rWCzJ3GosQ3WWuUfsdtm+gkJFivg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Nrw92TFt; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Nrw92TFt" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-48336a6e932so8201105e9.3 for ; Thu, 19 Feb 2026 09:06:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771520794; x=1772125594; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=fA3pKx5AN5x/APCEfqAvfW0pxwW9zZ1rtfJ16/Xi50A=; b=Nrw92TFtG3nRexzyUvFTCM/s/wZdh4/0iAX7nT6I8P5Zw3oTe8HtQXy4VkupMpyyba kc4Kx5YxaCwhMifi5wGIpovUWg5vrEKZhfQgvobdrSNDDNF1kYe1avtfLaRfduVkfMOR rGfD352GWi1p9o62yVO8ONG/TPkmIekorAMI9Pb2S0ZIL8eEeMM6M6S389O6BwKquyL6 dQKuaqf/tuXLpJ5KpP0ZgCo+9b1qQ4KvrkzAf+rpeB5IYvpV6+na0FEqh17MUdJNgyjg yTQ03+9ImhXK+fWfhdYLkHLDtfnxaci8IUqQisLAGNTIgX6WYcTdqWrqDCi9q3jAcd7t ZN8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771520794; x=1772125594; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fA3pKx5AN5x/APCEfqAvfW0pxwW9zZ1rtfJ16/Xi50A=; b=qAeVb0ZkcYCij5qfJ5iw/TiZo/FN6WLLLe9q8g5aq6smPukHlH4vF+dqyadOVRqbLJ QgQUrCtkI342OLNM6bSXM7X4lhyuUEcXPZmUaWOZs75wotVpDgnwSJHMq0Htj/O/94kW 8ry7YgBDPdG+VfgcEALG/gD2+E7my8+fDPMYDXVUiW69GwxnoaL2XuQwxQDFHqvQlDxS T+u0AadVi7M68GpbjNjFKVlYJQrEz75OrG1IgxREzr+LfNPtSOSHHUdaJET93E6II+qN 0llNnx34bv4Y+PSPFl3uXDVhW1FWdOCYdNPSsJlBSAclJXwqR3nwmQltAYXrVyN1xwkE C/NQ== X-Forwarded-Encrypted: i=1; AJvYcCVsDMWUfsv/WR2vxJ7h7v4//pz6jbuFBqaNXjefqaQitccUepe/moE3ChWvK3kgOllkD4f9nNYP/t0nJbo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2gMz5GN8ZKJ9Ff96vUGjuSogxdjsNxjQ8Q/3Ye/f8Re5BAUHI v1R9dWCvSf9J7jHXf6gQwgTbcFyePS1jSypu/4zSk+1bEhuAhuUapNxd X-Gm-Gg: AZuq6aLdx4K6hS5/n9V4y2aHQSrKvR+iee4FtoA+14Eobubk5rYd3+bohIOadiCwFuN qiSFKlgKj3jzCLC7kJCukFI1ZjOWzdapwsbVbjz7oDNAve0Q5YsUjSh2JND+j31u+uaVDb6yQfy i/jqxAa0cNWIDW2fKGFCbor1DABXSZW2XjjDrdQh6C0JutQ6u318jJlzGA9XUtV4Z5hIaKP0q33 mdOXl6DrspfhfV35btmHLJdJw/B9MXZj3XMyc1r5YlPCeKMPf3CE6f6n7/K0Iybw9McprC1F0Ro e+ulkKAeRbRFlAvy+jaDk0kzlv5hVW0tsNYb1TdYM+Ky/30J9YBmdoMyyxutu/LHmd4MRIsDE+2 7lPIRfboGkejVs5REgEyCMesp+zP5t+C2rAVNATExCu0C/8N4IyygrQvCbUvtFMlLExq3mydi8S qTTxZoIvKR+0zOEc5naeuTEvkwzR93uEaq7n62w8YH7rIBumgq6wUKZ1EoS0tUT5luQg3H17yva wC/TUQ= X-Received: by 2002:a05:6000:615:b0:435:e440:f518 with SMTP id ffacd0b85a97d-4379dbad3d7mr36702033f8f.54.1771520793387; Thu, 19 Feb 2026 09:06:33 -0800 (PST) Received: from toolbox (248.201.173.83.static.wline.lns.sme.cust.swisscom.ch. [83.173.201.248]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796abd793sm49031868f8f.25.2026.02.19.09.06.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 09:06:33 -0800 (PST) Date: Thu, 19 Feb 2026 18:06:31 +0100 From: Max Krummenacher To: Frank Li Cc: Francesco Dolcini , Max Krummenacher , Conor Dooley , Fabio Estevam , Krzysztof Kozlowski , Peng Fan , Pengutronix Kernel Team , Rob Herring , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Revert "ARM: dts: imx: move nand related property under nand@0" Message-ID: References: <20260219151157.2549198-1-max.oss.09@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Hi Frank On Thu, Feb 19, 2026 at 11:01:26AM -0500, Frank Li wrote: > On Thu, Feb 19, 2026 at 04:11:49PM +0100, max.oss.09@gmail.com wrote: > > From: Max Krummenacher > > > > This reverts commit 8124b4a4a96b57d6cc3705a9df9623c52baa047b. > > > > The change introduced a regression: at least Colibri iMX6ULL and > > Colibri iMX7 no longer boot with that commit applied, while they boot > > again after reverting it. > > > > Although this has only been verified on these two modules, the issue > > is expected to affect all device trees using the gpmi-nand driver. > > > > [ 0.876938] Creating 5 MTD partitions on "gpmi-nand": > > [ 0.876974] 0x000000000000-0x000000080000 : "mx7-bcb" > > [ 0.879860] 0x000000080000-0x000000200000 : "u-boot1" > > [ 0.884761] 0x000000200000-0x000000380000 : "u-boot2" > > [ 0.886993] 0x000000380000-0x000000400000 : "u-boot-env" > > [ 0.894686] 0x000000400000-0x000020000000 : "ubi" > > [ 0.899054] gpmi-nand 33002000.nand-controller: driver registered. > > ... > > [ 0.960443] ubi0: default fastmap pool size: 200 > > [ 0.960476] ubi0: default fastmap WL pool size: 100 > > [ 0.960500] ubi0: attaching mtd4 > > [ 1.636355] ubi0 error: scan_peb: bad image sequence number 1588722158 in PEB 4060, expected 1574791632 > > ... > > [ 1.649889] ubi0 error: ubi_attach_mtd_dev: failed to attach mtd4, error -22 > > [ 1.650029] UBI error: cannot attach mtd4 > > ... > > [ 1.670262] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,253) > > Can you help found the real reason why not boot? > nand@0 is preferred format for MTD raw nand. > > Frank I guess the root cause is that the driver for gpmi-nand predates the update of the binding rules which want the nand device described in a child node 'nand@0' also for nand controllers which only can control one nand chip. While it is possible to update the driver in the same patch set as changing the device tree to understand the new dtb rules, maybe even falling back to the old definitions this likely breaks other users, most notable U-Boot. 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 > > > > --- > > > > 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 > >