Unverified Commit 7cb74e0c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt64-6.6-1' of... 

Merge tag 'mvebu-dt64-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt64 for 6.6 (part 1)

Add the NAND Flash Controller on the AC5/AC5X SOC device tree
Fix style issue

* tag 'mvebu-dt64-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: marvell: Add NAND flash controller to AC5
  arm64: dts: marvell: add missing space before {

Link: https://lore.kernel.org/r/87edk8t0kl.fsf@BL-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents bc924997 58fe7320

arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi

+18 −2
Original line number Diff line number Diff line
@@ -297,6 +297,16 @@ 
			status = "disabled";

		};



		nand: nand-controller@805b0000 {

			compatible = "marvell,ac5-nand-controller";

			reg =  <0x0 0x805b0000 0x0 0x00000054>;

			#address-cells = <0x1>;

			#size-cells = <0x0>;

			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&nand_clock>;

			status = "disabled";

		};



		gic: interrupt-controller@80600000 {

			compatible = "arm,gic-v3";

			#interrupt-cells = <3>;
@@ -319,5 +329,11 @@ 
			#clock-cells = <0>;

			clock-frequency = <200000000>;

		};



		nand_clock: nand-clock {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <400000000>;

		};

	};

};

arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts

+1 −1

File changed.

Contains only whitespace changes.