summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/armada-385-linksys.dtsi
diff options
context:
space:
mode:
authorMiquel Raynal <miquel.raynal@bootlin.com>2018-04-25 17:48:01 +0300
committerGregory CLEMENT <gregory.clement@bootlin.com>2018-05-18 19:36:57 +0300
commit925d5e426861338bd2bc9abc7edf6a5e363551b3 (patch)
tree31e17bf6e9f453257454d03e0739a1be163c1247 /arch/arm/boot/dts/armada-385-linksys.dtsi
parentc29a7cced1f732f799cc3a029146312ae1d217f5 (diff)
downloadlinux-925d5e426861338bd2bc9abc7edf6a5e363551b3.tar.xz
ARM: dts: armada-38x: 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-385-linksys.dtsi')
-rw-r--r--arch/arm/boot/dts/armada-385-linksys.dtsi16
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 4a0d7360110b..827e82be2201 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -138,13 +138,19 @@
};
};
-&nand {
+&nand_controller {
/* 128MiB or 256MiB */
status = "okay";
- num-cs = <1>;
- marvell,nand-keep-config;
- marvell,nand-enable-arbiter;
- nand-on-flash-bbt;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ nand: nand@0 {
+ reg = <0>;
+ label = "pxa3xx_nand-0";
+ nand-rb = <0>;
+ marvell,nand-keep-config;
+ nand-on-flash-bbt;
+ };
};
&mdio {