Commit 9857feb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 0d1409e4 ef19964d

arch/arm/boot/dts/imx7s.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1273,7 +1273,7 @@ 
		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 = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;