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

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: Arnd Bergmann <arnd@arndb.de>

+19 -3
+18 -2
arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
··· 135 135 clocks = <&cnm_clock>; 136 136 }; 137 137 138 - i2c0: i2c@11000{ 138 + i2c0: i2c@11000 { 139 139 compatible = "marvell,mv78230-i2c"; 140 140 reg = <0x11000 0x20>; 141 141 #address-cells = <1>; ··· 154 154 status = "disabled"; 155 155 }; 156 156 157 - i2c1: i2c@11100{ 157 + i2c1: i2c@11100 { 158 158 compatible = "marvell,mv78230-i2c"; 159 159 reg = <0x11100 0x20>; 160 160 #address-cells = <1>; ··· 297 297 status = "disabled"; 298 298 }; 299 299 300 + nand: nand-controller@805b0000 { 301 + compatible = "marvell,ac5-nand-controller"; 302 + reg = <0x0 0x805b0000 0x0 0x00000054>; 303 + #address-cells = <0x1>; 304 + #size-cells = <0x0>; 305 + interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>; 306 + clocks = <&nand_clock>; 307 + status = "disabled"; 308 + }; 309 + 300 310 gic: interrupt-controller@80600000 { 301 311 compatible = "arm,gic-v3"; 302 312 #interrupt-cells = <3>; ··· 328 318 compatible = "fixed-clock"; 329 319 #clock-cells = <0>; 330 320 clock-frequency = <200000000>; 321 + }; 322 + 323 + nand_clock: nand-clock { 324 + compatible = "fixed-clock"; 325 + #clock-cells = <0>; 326 + clock-frequency = <400000000>; 331 327 }; 332 328 }; 333 329 };
+1 -1
arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
··· 149 149 }; 150 150 151 151 /* SPI-NOR */ 152 - &cp0_spi1{ 152 + &cp0_spi1 { 153 153 status = "okay"; 154 154 155 155 pinctrl-names = "default";