Skip to content

Commit 7cb74e0

Browse files
committed
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>
2 parents bc92499 + 58fe732 commit 7cb74e0

2 files changed

Lines changed: 19 additions & 3 deletions

File tree

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
clocks = <&cnm_clock>;
136136
};
137137

138-
i2c0: i2c@11000{
138+
i2c0: i2c@11000 {
139139
compatible = "marvell,mv78230-i2c";
140140
reg = <0x11000 0x20>;
141141
#address-cells = <1>;
@@ -154,7 +154,7 @@
154154
status = "disabled";
155155
};
156156

157-
i2c1: i2c@11100{
157+
i2c1: i2c@11100 {
158158
compatible = "marvell,mv78230-i2c";
159159
reg = <0x11100 0x20>;
160160
#address-cells = <1>;
@@ -297,6 +297,16 @@
297297
status = "disabled";
298298
};
299299

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+
300310
gic: interrupt-controller@80600000 {
301311
compatible = "arm,gic-v3";
302312
#interrupt-cells = <3>;
@@ -319,5 +329,11 @@
319329
#clock-cells = <0>;
320330
clock-frequency = <200000000>;
321331
};
332+
333+
nand_clock: nand-clock {
334+
compatible = "fixed-clock";
335+
#clock-cells = <0>;
336+
clock-frequency = <400000000>;
337+
};
322338
};
323339
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
};
150150

151151
/* SPI-NOR */
152-
&cp0_spi1{
152+
&cp0_spi1 {
153153
status = "okay";
154154

155155
pinctrl-names = "default";

0 commit comments

Comments
 (0)