summaryrefslogtreecommitdiffstats
path: root/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
diff options
context:
space:
mode:
authorGregory CLEMENT <gregory.clement@free-electrons.com>2017-09-25 16:53:52 +0200
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-09-27 15:34:01 +0200
commit73ae5fe8a52ff8543011e476e406f83e80a53145 (patch)
treeabca6112fb79fe3caf38c5402ad254ed3b6095a1 /arch/arm64/boot/dts/marvell/armada-70x0.dtsi
parent441fadadaebacfd5079648354b511a9f21ce9fd7 (diff)
downloadlinux-73ae5fe8a52ff8543011e476e406f83e80a53145.tar.bz2
arm64: dts: marvell: add NAND support on the 7040-DB board
The NAND controller used in A7K/A8K is present on the CP110 master part. It is compatible with the pxa3xx_nand driver but requires the use of the marvell,armada-8k-nand compatible string due to the need to first enable the NAND controller. Add properties to the NAND node to fit the bindings constraints of the pxa3xx_nand driver and enable the NAND controller. Add the 'marvell,system-controller' property to the cp110 master NAND node with a reference to the syscon node. This is new compared to other boards using the pxa3xx_nand driver and it is needed to be bootloader independent and enable the NAND controller from the NAND controller driver itself by writing in these syscon registers. Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> [miquel.raynal@free-electrons.com: add NAND ready/busy MPP subnode, change compatible string to fit the needs of the A7k/A8k SoCs and add the system controller property] Signed-off-by: Miquel Raynal <miquel.raynal@free-electrons.com>
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-70x0.dtsi')
-rw-r--r--arch/arm64/boot/dts/marvell/armada-70x0.dtsi14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
index 860b6ae9dcc5..0e1a1e5be399 100644
--- a/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-70x0.dtsi
@@ -64,5 +64,19 @@
&cpm_syscon0 {
cpm_pinctrl: pinctrl {
compatible = "marvell,armada-7k-pinctrl";
+
+ nand_pins: nand-pins {
+ marvell,pins =
+ "mpp15", "mpp16", "mpp17", "mpp18",
+ "mpp19", "mpp20", "mpp21", "mpp22",
+ "mpp23", "mpp24", "mpp25", "mpp26",
+ "mpp27";
+ marvell,function = "dev";
+ };
+
+ nand_rb: nand-rb {
+ marvell,pins = "mpp13";
+ marvell,function = "nf";
+ };
};
};