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

Commit 1004a297 authored by Boris Brezillon's avatar Boris Brezillon Committed by Alexandre Belloni
Browse files

ARM: dts: at91: Switch to the new NAND bindings 



Use the new EBI/NAND bindings to declare NAND chips and remove old NAND
nodes along the way.

Note that we keep using old bindings in at91rm9200.dtsi because this
SoC is not supported by the EBI driver.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Tested-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent d9c41bf3

arch/arm/boot/dts/aks-cdu.dts

+30 −26
Original line number Diff line number Diff line
@@ -62,12 +62,10 @@ 
			status = "okay";

		};



		nand0: nand@40000000 {

			nand-bus-width = <8>;

			nand-ecc-mode = "soft";

			nand-on-flash-bbt;

			status = "okay";



		ebi: ebi@10000000 {

			nand_controller: nand-controller {

				nand: nand@3 {

					partitions {

						bootstrap@0 {

							label = "bootstrap";

							reg = <0x0 0x40000>;
@@ -77,20 +75,26 @@ 
							label = "uboot";

							reg = <0x40000 0x80000>;

						};



						ubootenv@c0000 {

							label = "ubootenv";

							reg = <0xc0000 0x40000>;

						};



						kernel@100000 {

							label = "kernel";

							reg = <0x100000 0x400000>;

						};



						rootfs@500000 {

							label = "rootfs";

							reg = <0x500000 0x7b00000>;

						};

					};

				};

			};

		};

	};



	leds {

		compatible = "gpio-leds";

arch/arm/boot/dts/animeo_ip.dts

+36 −17
Original line number Diff line number Diff line
@@ -83,11 +83,27 @@ 
			};

		};



		nand0: nand@40000000 {

		ebi: ebi@10000000 {

			status = "okay";



			nand_controller: nand-controller {

				status = "okay";

				pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;

				pinctrl-names = "default";



				nand@3 {

					reg = <0x3 0x0 0x800000>;

					rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;

					cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;

					nand-bus-width = <8>;

					nand-ecc-mode = "soft";

					nand-on-flash-bbt;

			status = "okay";

					label = "atmel_nand";



					partitions {

						compatible = "fixed-partitions";

						#address-cells = <1>;

						#size-cells = <1>;



						barebox@0 {

							label = "barebox";
@@ -104,6 +120,9 @@ 
							reg = <0x60000 0x1FA0000>;

						};

					};

				};

			};

		};



		usb0: ohci@500000 {

			num-ports = <2>;

arch/arm/boot/dts/at91-cosino.dtsi

+53 −30
Original line number Diff line number Diff line
@@ -82,14 +82,34 @@ 
			};

		};



		nand0: nand@40000000 {

		ebi: ebi@10000000 {

			pinctrl-0 = <&pinctrl_ebi_addr_nand

				     &pinctrl_ebi_data_0_7>;

			pinctrl-names = "default";

			status = "okay";



			nand_controller: nand-controller {

				status = "okay";

				pinctrl-0 = <&pinctrl_nand_oe_we

					     &pinctrl_nand_cs

					     &pinctrl_nand_rb>;

				pinctrl-names = "default";



				nand@3 {

					reg = <0x3 0x0 0x800000>;

					rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;

					cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;

					nand-bus-width = <8>;

					nand-ecc-mode = "hw";

			atmel,has-pmecc;	/* Enable PMECC */

			atmel,pmecc-cap = <4>;

			atmel,pmecc-sector-size = <512>;

					nand-ecc-strength = <4>;

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

					nand-on-flash-bbt;

			status = "okay";

					label = "atmel_nand";



					partitions {

						compatible = "fixed-partitions";

						#address-cells = <1>;

						#size-cells = <1>;



						at91bootstrap@0 {

							label = "at91bootstrap";
@@ -118,3 +138,6 @@ 
					};

				};

			};

		};

	};

};

arch/arm/boot/dts/at91-kizbox.dts

+31 −11
Original line number Diff line number Diff line
@@ -59,10 +59,27 @@ 
			status = "okay";

		};



		nand0: nand@40000000 {

		ebi: ebi@10000000 {

			status = "okay";



			nand_controller: nand-controller {

				status = "okay";

				pinctrl-0 = <&pinctrl_nand_cs &pinctrl_nand_rb>;

				pinctrl-names = "default";



				nand@3 {

					reg = <0x3 0x0 0x800000>;

					rb-gpios = <&pioC 13 GPIO_ACTIVE_HIGH>;

					cs-gpios = <&pioC 14 GPIO_ACTIVE_HIGH>;

					nand-bus-width = <8>;

					nand-ecc-mode = "soft";

			status = "okay";

					nand-on-flash-bbt;

					label = "atmel_nand";



					partitions {

						compatible = "fixed-partitions";

						#address-cells = <1>;

						#size-cells = <1>;



						bootstrap@0 {

							label = "bootstrap";
@@ -75,6 +92,9 @@ 
						};

					};

				};

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

arch/arm/boot/dts/at91-kizbox2.dts

+31 −14
Original line number Diff line number Diff line
@@ -141,14 +141,28 @@ 
			status = "okay";

		};



		nand0: nand@60000000 {

		ebi: ebi@10000000 {

			pinctrl-0 = <&pinctrl_ebi_nand_addr>;

			pinctrl-names = "default";

			status = "okay";



			nand_controller: nand-controller {

				status = "okay";



				nand@3 {

					reg = <0x3 0x0 0x2>;

					atmel,rb = <0>;

					nand-bus-width = <8>;

					nand-ecc-mode = "hw";

			atmel,has-pmecc;

			atmel,pmecc-cap = <4>;

			atmel,pmecc-sector-size = <512>;

					nand-ecc-strength = <4>;

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

					nand-on-flash-bbt;

			status = "okay";

					label = "atmel_nand";



					partitions {

						compatible = "fixed-partitions";

						#address-cells = <1>;

						#size-cells = <1>;



						bootstrap@0 {

							label = "bootstrap";
@@ -161,6 +175,9 @@ 
						};

					};

				};

			};

		};

	};



	gpio_keys {

		compatible = "gpio-keys";