From patchwork Mon Dec 5 15:23:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francesco Dolcini X-Patchwork-Id: 13064674 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F049AC4332F for ; Mon, 5 Dec 2022 15:25:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6uj/68hP6w6B/lO3TjOalJGIgVeKN4p1vUSwK2sS+tg=; b=kSKoKSjVBOoFAM +z1mJpoPtov5RWbTTlj/uKJQCPb8pLtFTKOPUdPplx8zHqVVlqUaroBx+Ls7dQqyyOR1BURAcIKS+ rR9Nlt1F1ZIFrPusSmvKMlIpm2bZg9wTIz24RME8OkEutxizXsXe6vprmujJUokG8orAFmPpS/36n n05S3etINMW2wrNfhG6Js5EtAkZE+P3A95qMfKFixNTY4OwRvXladRHA0X4nnpYPrdYnyPMS6/ulZ eKS0lZxk172R3ZYd0YEe4gRSt/cqrlViPd1EF2cC0uzL5NKg2078K6+t64CYYH78arxoLSR7POYU5 6Yvm8IcCUtKFTw0wCiRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2DJv-004io8-PW; Mon, 05 Dec 2022 15:23:52 +0000 Received: from smtp-out-05.comm2000.it ([212.97.32.73]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p2DJq-004ilj-H6; Mon, 05 Dec 2022 15:23:48 +0000 Received: from francesco-nb.toradex.int (31-10-206-125.static.upc.ch [31.10.206.125]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: francesco@dolcini.it) by smtp-out-05.comm2000.it (Postfix) with ESMTPSA id E8EAA8240D3; Mon, 5 Dec 2022 16:23:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mailserver.it; s=mailsrv; t=1670253819; bh=kHr0aTjYplJsrICaBlaf8mmyRJ9l5EZ0Gq7KL8EAlqE=; h=From:To:Cc:Subject:Date; b=cBPD/nURivJ8O5RZoA8hzMlVtiZuEZgWhN4Wj8BDRChGtKFKVdWF4sane+Zcr1Jzs RqSIfZWiRpnxRFre97ab42h1KMU4/LbK6kceQMQegJsbIAHZ4PBTLBu2v4PrEP3581 B7BuQMvFC2UoGobIRy8/W9DRCwxHFvHrYoiAcuWI53oNo6BnFsCazJHTDMw25hJOKB QP+AYYkOBeDyEe2vdN0q0lKTZb279ljQVlf62Nzm8amMGJRdym4Z/VrLWM4+QWxkR7 kLcSYsi6QEMHUYTOAIP5vMZX9ICmGlOchHLaJHF5WLb4epdEzoB8EIxSJQBsz/69D1 FO+fk/0FDzurg== From: Francesco Dolcini To: Shawn Guo , linux-arm-kernel@lists.infradead.org, Marek Vasut , Miquel Raynal Cc: Francesco Dolcini , Rob Herring , Krzysztof Kozlowski , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-mtd@lists.infradead.org, stable@vger.kernel.org Subject: [PATCH v1] Revert "ARM: dts: imx7: Fix NAND controller size-cells" Date: Mon, 5 Dec 2022 16:23:27 +0100 Message-Id: <20221205152327.26881-1-francesco@dolcini.it> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221205_072346_749812_84872A35 X-CRM114-Status: GOOD ( 11.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Francesco Dolcini This reverts commit 753395ea1e45c724150070b5785900b6a44bd5fb. It introduced a boot regression on colibri-imx7, and potentially any other i.MX7 boards with MTD partition list generated into the fdt by U-Boot. While the commit we are reverting here is not obviously wrong, it fixes only a dt binding checker warning that is non-functional, while it introduces a boot regression and there is no obvious fix ready. Cc: stable@vger.kernel.org Fixes: 753395ea1e45 ("ARM: dts: imx7: Fix NAND controller size-cells") Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/ Link: https://lore.kernel.org/all/20221205144917.6514168a@xps-13/ Signed-off-by: Francesco Dolcini Acked-by: Marek Vasut Reviewed-by: Miquel Raynal --- arch/arm/boot/dts/imx7s.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 03d2e8544a4e..0fc9e6b8b05d 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -1270,10 +1270,10 @@ dma_apbh: dma-apbh@33000000 { clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; }; - gpmi: nand-controller@33002000 { + gpmi: nand-controller@33002000{ compatible = "fsl,imx7d-gpmi-nand"; #address-cells = <1>; - #size-cells = <0>; + #size-cells = <1>; reg = <0x33002000 0x2000>, <0x33004000 0x4000>; reg-names = "gpmi-nand", "bch"; interrupts = ;