tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'soc-fixes-6.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fix from Arnd Bergmann:
"One more last minute revert for a boot regression that was found on
the popular colibri-imx7"

* tag 'soc-fixes-6.1-6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
Revert "ARM: dts: imx7: Fix NAND controller size-cells"

Linus Torvalds 9857feb3 0d1409e4

+2 -2
+2 -2
arch/arm/boot/dts/imx7s.dtsi
··· 1270 clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; 1271 }; 1272 1273 - gpmi: nand-controller@33002000 { 1274 compatible = "fsl,imx7d-gpmi-nand"; 1275 #address-cells = <1>; 1276 - #size-cells = <0>; 1277 reg = <0x33002000 0x2000>, <0x33004000 0x4000>; 1278 reg-names = "gpmi-nand", "bch"; 1279 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
··· 1270 clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; 1271 }; 1272 1273 + gpmi: nand-controller@33002000{ 1274 compatible = "fsl,imx7d-gpmi-nand"; 1275 #address-cells = <1>; 1276 + #size-cells = <1>; 1277 reg = <0x33002000 0x2000>, <0x33004000 0x4000>; 1278 reg-names = "gpmi-nand", "bch"; 1279 interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;