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

Commit 925d5e42 authored by Miquel Raynal's avatar Miquel Raynal Committed by Gregory CLEMENT
Browse files

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: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@bootlin.com>
parent c29a7cce

arch/arm/boot/dts/armada-385-db-ap.dts

+36 −33
Original line number Diff line number Diff line
@@ -135,39 +135,6 @@ 
				status = "okay";

			};



			nfc: flash@d0000 {

				status = "okay";

				num-cs = <1>;

				nand-ecc-strength = <4>;

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

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partitions {

					compatible = "fixed-partitions";

					#address-cells = <1>;

					#size-cells = <1>;



					partition@0 {

						label = "U-Boot";

						reg = <0x00000000 0x00800000>;

						read-only;

					};



					partition@800000 {

						label = "uImage";

						reg = <0x00800000 0x00400000>;

						read-only;

					};



					partition@c00000 {

						label = "Root";

						reg = <0x00c00000 0x3f400000>;

					};

				};

			};



			usb3@f0000 {

				status = "okay";

				usb-phy = <&usb3_phy>;
@@ -233,3 +200,39 @@ 
		spi-max-frequency = <54000000>;

	};

};



&nand_controller {

	status = "okay";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		nand-on-flash-bbt;

		nand-ecc-strength = <4>;

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



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "U-Boot";

				reg = <0x00000000 0x00800000>;

				read-only;

			};



			partition@800000 {

				label = "uImage";

				reg = <0x00800000 0x00400000>;

				read-only;

			};



			partition@c00000 {

				label = "Root";

				reg = <0x00c00000 0x3f400000>;

			};

		};

	};

};

arch/arm/boot/dts/armada-385-linksys-caiman.dts

+67 −62
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ 


&nand {

	/* 128MiB */

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "u-boot";
@@ -137,3 +141,4 @@ 
			reg = <0x280000 0x680000>;   /* 6.5MiB */

		};

	};

};

arch/arm/boot/dts/armada-385-linksys-cobra.dts

+67 −62
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ 


&nand {

	/* 128MiB */

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "u-boot";
@@ -137,3 +141,4 @@ 
			reg = <0x280000 0x680000>;   /* 6.5MiB */

		};

	};

};

arch/arm/boot/dts/armada-385-linksys-rango.dts

+73 −68
Original line number Diff line number Diff line
@@ -81,6 +81,10 @@ 


&nand {

	/* AMD/Spansion S34ML02G2 256MiB, OEM Layout */

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "u-boot";
@@ -151,6 +155,7 @@ 
			reg = <0x260000 0x5c0000>;   /* 5.75MiB */

		};

	};

};



&sdhci {

	pinctrl-names = "default";

arch/arm/boot/dts/armada-385-linksys-shelby.dts

+67 −62
Original line number Diff line number Diff line
@@ -73,6 +73,10 @@ 


&nand {

	/* 128MiB */

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		partition@0 {

			label = "u-boot";
@@ -137,3 +141,4 @@ 
			reg = <0x280000 0x680000>;   /* 6.5MiB */

		};

	};

};