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

Commit 3b799199 authored by Miquel Raynal's avatar Miquel Raynal Committed by Gregory CLEMENT
Browse files

ARM: dts: armada-370-xp: 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 60cc43fc

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

+30 −27
Original line number Original line Diff line number Diff line
@@ -105,33 +105,6 @@ 
			usb@51000 {

			usb@51000 {

				status = "okay";

				status = "okay";

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				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 = <0 0x800000>;

					};

					partition@800000 {

						label = "Linux";

						reg = <0x800000 0x800000>;

					};

					partition@1000000 {

						label = "Filesystem";

						reg = <0x1000000 0x3f000000>;

					};

				};

			};

		};

		};

	};

	};
@@ -239,3 +212,33 @@ 
	};

	};

};

};





&nand_controller {

	status = "okay";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		marvell,nand-keep-config;

		nand-on-flash-bbt;



		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-370-dlink-dns327l.dts

+65 −55
Original line number Original line Diff line number Diff line
@@ -44,61 +44,6 @@ 
			usb@50000 {

			usb@50000 {

				status = "okay";

				status = "okay";

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

				nand-ecc-strength = <4>;

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



				partition@0 {

					label = "u-boot";

					/* 1.0 MiB */

					reg = <0x0000000 0x100000>;

					read-only;

				};



				partition@100000 {

					label = "u-boot-env";

					/* 128 KiB */

					reg = <0x100000 0x20000>;

					read-only;

				};



				partition@120000 {

					label = "uImage";

					/* 7 MiB */

					reg = <0x120000 0x700000>;

				};



				partition@820000 {

					label = "ubifs";

					/* ~ 84 MiB */

					reg = <0x820000 0x54e0000>;

				};



				/* Hardcoded into stock bootloader */

				partition@5d00000 {

					label = "failsafe-uImage";

					/* 5 MiB */

					reg = <0x5d00000 0x500000>;

				};



				partition@6200000 {

					label = "failsafe-fs";

					/* 29 MiB */

					reg = <0x6200000 0x1d00000>;

				};



				partition@7f00000 {

					label = "bbt";

					/* 1 MiB for BBT */

					reg = <0x7f00000 0x100000>;

				};

			};

		};

		};

	};

	};
@@ -319,3 +264,68 @@ 
	clock-frequency = <100000>;

	clock-frequency = <100000>;

	status = "okay";

	status = "okay";

};

};



&nand_controller {

	status = "okay";



	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";

				/* 1.0 MiB */

				reg = <0x0000000 0x100000>;

				read-only;

			};



			partition@100000 {

				label = "u-boot-env";

				/* 128 KiB */

				reg = <0x100000 0x20000>;

				read-only;

			};



			partition@120000 {

				label = "uImage";

				/* 7 MiB */

				reg = <0x120000 0x700000>;

			};



			partition@820000 {

				label = "ubifs";

				/* ~ 84 MiB */

				reg = <0x820000 0x54e0000>;

			};



			/* Hardcoded into stock bootloader */

			partition@5d00000 {

				label = "failsafe-uImage";

				/* 5 MiB */

				reg = <0x5d00000 0x500000>;

			};



			partition@6200000 {

				label = "failsafe-fs";

				/* 29 MiB */

				reg = <0x6200000 0x1d00000>;

			};



			partition@7f00000 {

				label = "bbt";

				/* 1 MiB for BBT */

				reg = <0x7f00000 0x100000>;

			};

		};

	};

};

arch/arm/boot/dts/armada-370-mirabox.dts

+30 −21
Original line number Original line Diff line number Diff line
@@ -108,27 +108,6 @@ 
					reg = <0x25>;

					reg = <0x25>;

				};

				};

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				partition@0 {

					label = "U-Boot";

					reg = <0 0x400000>;

				};

				partition@400000 {

					label = "Linux";

					reg = <0x400000 0x400000>;

				};

				partition@800000 {

					label = "Filesystem";

					reg = <0x800000 0x3f800000>;

				};

			};

		};

		};

	};

	};

};

};
@@ -173,3 +152,33 @@ 
	};

	};

};

};





&nand_controller {

	status = "okay";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		marvell,nand-keep-config;

		nand-on-flash-bbt;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			partition@0 {

				label = "U-Boot";

				reg = <0 0x400000>;

			};

			partition@400000 {

				label = "Linux";

				reg = <0x400000 0x400000>;

			};

			partition@800000 {

				label = "Filesystem";

				reg = <0x800000 0x3f800000>;

			};

		};

	};

};

arch/arm/boot/dts/armada-370-netgear-rn102.dts

+50 −40
Original line number Original line Diff line number Diff line
@@ -81,46 +81,6 @@ 
					pwm_polarity = <0>;

					pwm_polarity = <0>;

				};

				};

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				/* Use Hardware BCH ECC */

				nand-ecc-strength = <4>;

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



				partition@0 {

					label = "u-boot";

					reg = <0x0000000 0x180000>;  /* 1.5MB */

					read-only;

				};



				partition@180000 {

					label = "u-boot-env";

					reg = <0x180000 0x20000>;    /* 128KB */

					read-only;

				};



				partition@200000 {

					label = "uImage";

					reg = <0x0200000 0x600000>;    /* 6MB */

				};



				partition@800000 {

					label = "minirootfs";

					reg = <0x0800000 0x400000>;    /* 4MB */

				};



				/* Last MB is for the BBT, i.e. not writable */

				partition@c00000 {

					label = "ubifs";

					reg = <0x0c00000 0x7400000>; /* 116MB */

				};

			};

		};

		};

	};

	};
@@ -264,3 +224,53 @@ 
		marvell,function = "gpio";

		marvell,function = "gpio";

	};

	};

};

};



&nand_controller {

	status = "okay";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		marvell,nand-keep-config;

		nand-on-flash-bbt;



		/* Use Hardware BCH ECC */

		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 = <0x0000000 0x180000>;  /* 1.5MB */

				read-only;

			};



			partition@180000 {

				label = "u-boot-env";

				reg = <0x180000 0x20000>;    /* 128KB */

				read-only;

			};



			partition@200000 {

				label = "uImage";

				reg = <0x0200000 0x600000>;    /* 6MB */

			};



			partition@800000 {

				label = "minirootfs";

				reg = <0x0800000 0x400000>;    /* 4MB */

			};



			/* Last MB is for the BBT, i.e. not writable */

			partition@c00000 {

				label = "ubifs";

				reg = <0x0c00000 0x7400000>; /* 116MB */

			};

		};

	};

};

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+50 −40
Original line number Original line Diff line number Diff line
@@ -90,46 +90,6 @@ 
					reg = <0x23>;

					reg = <0x23>;

				};

				};

			};

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;



				/* Use Hardware BCH ECC */

				nand-ecc-strength = <4>;

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



				partition@0 {

					label = "u-boot";

					reg = <0x0000000 0x180000>;  /* 1.5MB */

					read-only;

				};



				partition@180000 {

					label = "u-boot-env";

					reg = <0x180000 0x20000>;    /* 128KB */

					read-only;

				};



				partition@200000 {

					label = "uImage";

					reg = <0x0200000 0x600000>;    /* 6MB */

				};



				partition@800000 {

					label = "minirootfs";

					reg = <0x0800000 0x400000>;    /* 4MB */

				};



				/* Last MB is for the BBT, i.e. not writable */

				partition@c00000 {

					label = "ubifs";

					reg = <0x0c00000 0x7400000>; /* 116MB */

				};

			};

		};

		};

	};

	};
@@ -276,3 +236,53 @@ 
		marvell,function = "gpio";

		marvell,function = "gpio";

	};

	};

};

};



&nand_controller {

	status = "okay";



	nand@0 {

		reg = <0>;

		label = "pxa3xx_nand-0";

		nand-rb = <0>;

		marvell,nand-keep-config;

		nand-on-flash-bbt;



		/* Use Hardware BCH ECC */

		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 = <0x0000000 0x180000>;  /* 1.5MB */

				read-only;

			};



			partition@180000 {

				label = "u-boot-env";

				reg = <0x180000 0x20000>;    /* 128KB */

				read-only;

			};



			partition@200000 {

				label = "uImage";

				reg = <0x0200000 0x600000>;    /* 6MB */

			};



			partition@800000 {

				label = "minirootfs";

				reg = <0x0800000 0x400000>;    /* 4MB */

			};



			/* Last MB is for the BBT, i.e. not writable */

			partition@c00000 {

				label = "ubifs";

				reg = <0x0c00000 0x7400000>; /* 116MB */

			};

		};

	};

};