Skip to content

Commit ef19964

Browse files
dolciniarndb
authored andcommitted
Revert "ARM: dts: imx7: Fix NAND controller size-cells"
This reverts commit 753395e. 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. Fixes: 753395e ("ARM: dts: imx7: Fix NAND controller size-cells") Signed-off-by: Francesco Dolcini <[email protected]> Reviewed-by: Miquel Raynal <[email protected]> Acked-by: Marek Vasut <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/20221205144917.6514168a@xps-13/ Signed-off-by: Arnd Bergmann <[email protected]>
1 parent da0cbf9 commit ef19964

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/boot/dts/imx7s.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,10 +1270,10 @@
12701270
clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>;
12711271
};
12721272

1273-
gpmi: nand-controller@33002000 {
1273+
gpmi: nand-controller@33002000{
12741274
compatible = "fsl,imx7d-gpmi-nand";
12751275
#address-cells = <1>;
1276-
#size-cells = <0>;
1276+
#size-cells = <1>;
12771277
reg = <0x33002000 0x2000>, <0x33004000 0x4000>;
12781278
reg-names = "gpmi-nand", "bch";
12791279
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)