diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2018-04-25 16:48:02 +0200 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@bootlin.com> | 2018-05-18 18:36:57 +0200 |
| commit | 0ae1177480aa2ade855081010a60433aa614479e (patch) | |
| tree | 8f8529a81c47f283839ee8344843ba8043bc50c4 /arch/arm/boot/dts/armada-39x.dtsi | |
| parent | ARM: dts: armada-38x: update NAND node with new bindings (diff) | |
| download | linux-0ae1177480aa2ade855081010a60433aa614479e.tar.xz linux-0ae1177480aa2ade855081010a60433aa614479e.zip | |
ARM: dts: armada-39x: update NAND node with new bindings
Use the new bindings of the Marvell NAND controller driver. Also adapt
the NAND controller node organization to distinguish which property is
relevant for the controller, and which one is NAND chip specific. Expose
the partitions as a subnode of the NAND chip.
Remove the 'marvell,nand-enable-arbiter' property, not needed anymore
as the new driver activates the arbiter by default for all boards which
is either needed or harmless.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Diffstat (limited to 'arch/arm/boot/dts/armada-39x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-39x.dtsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi index c1737c0a8325..f0c949831efb 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi @@ -367,11 +367,11 @@ interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; }; - flash@d0000 { - compatible = "marvell,armada370-nand"; + nand_controller: nand-controller@d0000 { + compatible = "marvell,armada370-nand-controller"; reg = <0xd0000 0x54>; #address-cells = <1>; - #size-cells = <1>; + #size-cells = <0>; interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>; clocks = <&coredivclk 0>; status = "disabled"; |