Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm64/boot/dts/marvell/armada-8040-db.dts

+27 −19
Original line number Diff line number Diff line
@@ -240,15 +240,21 @@ 
 * Proper NAND usage will require DPR-76 to be in position 1-2, which disables

 * MDIO signal of CP1.

 */

&cp1_nand {

	num-cs = <1>;

&cp1_nand_controller {

	pinctrl-0 = <&nand_pins>, <&nand_rb>;

	pinctrl-names = "default";



	nand@0 {

		reg = <0>;

		nand-rb = <0>;

		nand-on-flash-bbt;

		nand-ecc-strength = <4>;

		nand-ecc-step-size = <512>;

	marvell,nand-enable-arbiter;

	marvell,system-controller = <&cp1_syscon0>;

	nand-on-flash-bbt;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "U-Boot";
@@ -263,6 +269,8 @@ 
				reg = <0x1000000 0x3f000000>;

			};

		};

	};

};



/* CON4 on CP1 expansion */

&cp1_sata0 {