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

Commit 0ae11774 authored by Miquel Raynal's avatar Miquel Raynal Committed by Gregory CLEMENT
Browse files

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

arch/arm/boot/dts/armada-390-db.dts

+35 −31
Original line number Diff line number Diff line
@@ -49,37 +49,6 @@ 
				status = "okay";

			};



			flash@d0000 {

				status = "okay";

				pinctrl-0 = <&nand_pins>;

				pinctrl-names = "default";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

				nand-ecc-strength = <8>;

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



				partitions {

					compatible = "fixed-partitions";

					#address-cells = <1>;

					#size-cells = <1>;



					partition@0 {

						label = "U-Boot";

						reg = <0 0x800000>;

					};

					partition@800000 {

						label = "Linux";

						reg = <0x800000 0x800000>;

					};

					partition@1000000 {

						label = "Filesystem";

						reg = <0x1000000 0x3f000000>;

					};

				};

			};



			/* CON98 */

			usb3@f8000 {

				status = "okay";
@@ -136,3 +105,38 @@ 
		};

	};

};



&nand_controller {

	status = "okay";

	pinctrl-0 = <&nand_pins>;

	pinctrl-names = "default";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		marvell,nand-keep-config;

		nand-on-flash-bbt;

		nand-ecc-strength = <8>;

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



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "U-Boot";

				reg = <0 0x800000>;

			};

			partition@800000 {

				label = "Linux";

				reg = <0x800000 0x800000>;

			};

			partition@1000000 {

				label = "Filesystem";

				reg = <0x1000000 0x3f000000>;

			};

		};

	};

};

arch/arm/boot/dts/armada-395-gp.dts

+39 −35
Original line number Diff line number Diff line
@@ -57,41 +57,6 @@ 
				status = "okay";

			};



			flash@d0000 {

				status = "okay";

				pinctrl-0 = <&nand_pins>;

				pinctrl-names = "default";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				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 0x00600000>;

						read-only;

					};



					partition@800000 {

						label = "uImage";

						reg = <0x00600000 0x00400000>;

						read-only;

					};



					partition@1000000 {

						label = "Root";

						reg = <0x00a00000 0x3f600000>;

					};

				};

			};



			/* CON18 */

			sdhci@d8000 {

				clock-frequency = <200000000>;
@@ -130,3 +95,42 @@ 
		};

	};

};



&nand_controller {

	status = "okay";

	pinctrl-0 = <&nand_pins>;

	pinctrl-names = "default";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		marvell,nand-keep-config;

		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 0x00600000>;

				read-only;

			};



			partition@800000 {

				label = "uImage";

				reg = <0x00600000 0x00400000>;

				read-only;

			};



			partition@1000000 {

				label = "Root";

				reg = <0x00a00000 0x3f600000>;

			};

		};

	};

};

arch/arm/boot/dts/armada-398-db.dts

+35 −25
Original line number Diff line number Diff line
@@ -51,31 +51,6 @@ 
				status = "okay";

			};



			flash@d0000 {

				status = "okay";

				pinctrl-0 = <&nand_pins>;

				pinctrl-names = "default";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

				nand-ecc-strength = <8>;

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



				partition@0 {

					label = "U-Boot";

					reg = <0 0x800000>;

				};

				partition@800000 {

					label = "Linux";

					reg = <0x800000 0x800000>;

				};

				partition@1000000 {

					label = "Filesystem";

					reg = <0x1000000 0x3f000000>;

				};

			};



			usb3@f8000 {

				status = "okay";

			};
@@ -122,3 +97,38 @@ 
		};

	};

};



&nand_controller {

	status = "okay";

	pinctrl-0 = <&nand_pins>;

	pinctrl-names = "default";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		marvell,nand-keep-config;

		nand-on-flash-bbt;

		nand-ecc-strength = <8>;

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



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "U-Boot";

				reg = <0 0x800000>;

			};

			partition@800000 {

				label = "Linux";

				reg = <0x800000 0x800000>;

			};

			partition@1000000 {

				label = "Filesystem";

				reg = <0x1000000 0x3f000000>;

			};

		};

	};

};

arch/arm/boot/dts/armada-39x.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -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";