linux-kernel - [GIT PULL] ARM: SoC fixes for 6.1, part 6

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <c2178eba-0c25-4310-8b87-1dc7708d2a34@app.fastmail.com>
Date:   Fri, 09 Dec 2022 16:25:17 +0100
From:   "Arnd Bergmann" <arnd@...db.de>
To:     "Linus Torvalds" <torvalds@...ux-foundation.org>
Cc:     "Francesco Dolcini" <francesco.dolcini@...adex.com>,
        "Miquel Raynal" <miquel.raynal@...tlin.com>,
        "Marek Vasut" <marex@...x.de>,
        "NXP Linux Team" <linux-imx@....com>, devicetree@...r.kernel.org,
        linux-mtd@...ts.infradead.org, stable@...r.kernel.org,
        "Thorsten Leemhuis" <regressions@...mhuis.info>, soc@...nel.org,
        linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: [GIT PULL] ARM: SoC fixes for 6.1, part 6

The following changes since commit da0cbf9307a227f52a38a0a580a4642ad9d7325c:

  Merge tag 'at91-fixes-6.1-3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes (2022-11-29 15:45:36 +0100)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/soc-fixes-6.1-6

for you to fetch changes up to ef19964da8a668c683f1d38274f6fb756e047945:

  Revert "ARM: dts: imx7: Fix NAND controller size-cells" (2022-12-08 17:47:57 +0100)

----------------------------------------------------------------
ARM: SoC fixes for 6.1, part 6

One more last minute revert for a boot regression that was
found on the popular colibri-imx7.

----------------------------------------------------------------

This came in just after I sent off the "final pull request for 6.1"
yesterday, and it seems important enough for another even more
final round.

Author: Francesco Dolcini <francesco.dolcini@...adex.com>
Date:   Mon Dec 5 16:23:27 2022 +0100

    Revert "ARM: dts: imx7: Fix NAND controller size-cells"
    
    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.
    
    Fixes: 753395ea1e45 ("ARM: dts: imx7: Fix NAND controller size-cells")
    Signed-off-by: Francesco Dolcini <francesco.dolcini@...adex.com>
    Reviewed-by: Miquel Raynal <miquel.raynal@...tlin.com>
    Acked-by: Marek Vasut <marex@...x.de>
    Cc: stable@...r.kernel.org
    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: Arnd Bergmann <arnd@...db.de>

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@...00000 {
                        clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>;
                };
 
-               gpmi: nand-controller@...02000 {
+               gpmi: nand-controller@...02000{
                        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 = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;