Commit 41d63e45 authored by Miquel Raynal's avatar Miquel Raynal Committed by Gregory CLEMENT

arm64: dts: marvell: use reworked NAND controller driver on Armada 8K

Use the new bindings of the reworked 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 driver activates the arbiter by default for all boards (either
needed or harmless).
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent 1e09a73f
...@@ -240,15 +240,21 @@ partition@f00000 { ...@@ -240,15 +240,21 @@ partition@f00000 {
* Proper NAND usage will require DPR-76 to be in position 1-2, which disables * Proper NAND usage will require DPR-76 to be in position 1-2, which disables
* MDIO signal of CP1. * MDIO signal of CP1.
*/ */
&cp1_nand { &cp1_nand_controller {
num-cs = <1>;
pinctrl-0 = <&nand_pins>, <&nand_rb>; pinctrl-0 = <&nand_pins>, <&nand_rb>;
pinctrl-names = "default"; pinctrl-names = "default";
nand@0 {
reg = <0>;
nand-rb = <0>;
nand-on-flash-bbt;
nand-ecc-strength = <4>; nand-ecc-strength = <4>;
nand-ecc-step-size = <512>; nand-ecc-step-size = <512>;
marvell,nand-enable-arbiter;
marvell,system-controller = <&cp1_syscon0>; partitions {
nand-on-flash-bbt; compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 { partition@0 {
label = "U-Boot"; label = "U-Boot";
...@@ -262,6 +268,8 @@ partition@1000000 { ...@@ -262,6 +268,8 @@ partition@1000000 {
label = "Filesystem"; label = "Filesystem";
reg = <0x1000000 0x3f000000>; reg = <0x1000000 0x3f000000>;
}; };
};
};
}; };
/* CON4 on CP1 expansion */ /* CON4 on CP1 expansion */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment