diff options
| author | Gregory CLEMENT | 2017-09-25 16:53:52 +0200 |
|---|---|---|
| committer | Gregory CLEMENT | 2017-09-27 15:34:01 +0200 |
| commit | 73ae5fe8a52ff8543011e476e406f83e80a53145 (patch) | |
| tree | abca6112fb79fe3caf38c5402ad254ed3b6095a1 /arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | |
| parent | arm64: dts: marvell: Enable Armada-8040-DB CPS SPI1 (diff) | |
| download | kernel-qcow2-linux-73ae5fe8a52ff8543011e476e406f83e80a53145.tar.gz kernel-qcow2-linux-73ae5fe8a52ff8543011e476e406f83e80a53145.tar.xz kernel-qcow2-linux-73ae5fe8a52ff8543011e476e406f83e80a53145.zip | |
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-cp110-master.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index b1119c541f16..19dabc930088 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -315,12 +315,14 @@ * this controller is only usable on the CPM * for A7K and on the CPS for A8K. */ - compatible = "marvell,armada370-nand"; + compatible = "marvell,armada-8k-nand", + "marvell,armada370-nand"; reg = <0x720000 0x54>; #address-cells = <1>; #size-cells = <1>; interrupts = <ICU_GRP_NSR 115 IRQ_TYPE_LEVEL_HIGH>; clocks = <&cpm_clk 1 2>; + marvell,system-controller = <&cpm_syscon0>; status = "disabled"; }; |