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

Commit b9734c59 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-4.20-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into next/dt 

AT91 DT for 4.20 #2

 - fixes NAND size and partitions for some boards

* tag 'at91-4.20-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  ARM: dts: at91: sama5d4_xplained: even nand memory partitions
  ARM: dts: at91: sama5d3_xplained: even nand memory partitions
  ARM: dts: at91: at91sam9x5cm: even nand memory partitions
  ARM: dts: at91: sama5d2_ptc_ek: fix bootloader env offsets
  ARM: dts: at91: at91sam9x5cm: fix addressable nand flash size
  ARM: dts: at91: sama5d4_xplained: fix addressable nand flash size

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3f8b181e 767466b6

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

+4 −4
Original line number Diff line number Diff line
@@ -91,13 +91,13 @@ 
							reg = <0x40000 0xc0000>;

						};



						bootloaderenv@0x100000 {

							label = "bootloader env";

						bootloaderenvred@0x100000 {

							label = "bootloader env redundant";

							reg = <0x100000 0x40000>;

						};



						bootloaderenvred@0x140000 {

							label = "bootloader env redundant";

						bootloaderenv@0x140000 {

							label = "bootloader env";

							reg = <0x140000 0x40000>;

						};

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

+8 −3
Original line number Diff line number Diff line
@@ -297,12 +297,17 @@ 


						bootloader@40000 {

							label = "bootloader";

							reg = <0x40000 0x80000>;

							reg = <0x40000 0xc0000>;

						};



						bootloaderenv@c0000 {

						bootloaderenvred@100000 {

							label = "bootloader env redundant";

							reg = <0x100000 0x40000>;

						};



						bootloaderenv@140000 {

							label = "bootloader env";

							reg = <0xc0000 0xc0000>;

							reg = <0x140000 0x40000>;

						};



						dtb@180000 {

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

+9 −4
Original line number Diff line number Diff line
@@ -232,12 +232,17 @@ 


						bootloader@40000 {

							label = "bootloader";

							reg = <0x40000 0x80000>;

							reg = <0x40000 0xc0000>;

						};



						bootloaderenv@c0000 {

						bootloaderenvred@100000 {

							label = "bootloader env redundant";

							reg = <0x100000 0x40000>;

						};



						bootloaderenv@140000 {

							label = "bootloader env";

							reg = <0xc0000 0xc0000>;

							reg = <0x140000 0x40000>;

						};



						dtb@180000 {
@@ -252,7 +257,7 @@ 


						rootfs@800000 {

							label = "rootfs";

							reg = <0x800000 0x0f800000>;

							reg = <0x800000 0x1f800000>;

						};

					};

				};

arch/arm/boot/dts/at91sam9x5cm.dtsi

+14 −4
Original line number Diff line number Diff line
@@ -85,12 +85,22 @@ 


						uboot@40000 {

							label = "u-boot";

							reg = <0x40000 0x80000>;

							reg = <0x40000 0xc0000>;

						};



						ubootenv@c0000 {

						ubootenvred@100000 {

							label = "U-Boot Env Redundant";

							reg = <0x100000 0x40000>;

						};



						ubootenv@140000 {

							label = "U-Boot Env";

							reg = <0xc0000 0x140000>;

							reg = <0x140000 0x40000>;

						};



						dtb@180000 {

							label = "device tree";

							reg = <0x180000 0x80000>;

						};



						kernel@200000 {
@@ -100,7 +110,7 @@ 


						rootfs@800000 {

							label = "rootfs";

							reg = <0x800000 0x1f800000>;

							reg = <0x800000 0x0f800000>;

						};

					};

				};