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

Merge tag 'socfpga_dts_update_for_v5.7' of... 

Merge tag 'socfpga_dts_update_for_v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into arm/dt

SoCFPGA DTS updates for v5.7
- Increase NAND boot partition for Arria10
- Increase QSPI partition for Stratix10 and Agilex

* tag 'socfpga_dts_update_for_v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  arm64: dts: increase the QSPI reg address for Stratix10 and Agilex
  ARM: dts: socfpga: arria10: Increase boot partition size for NAND

Link: https://lore.kernel.org/r/20200318145957.30338-1-dinguyen@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a95e12db 80f132d7

arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts

+2 −2
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


		partition@0 {

			label = "Boot and fpga data";

			reg = <0x0 0x1C00000>;

			reg = <0x0 0x02000000>;

		};

		partition@1c00000 {

			label = "Root Filesystem - JFFS2";

			reg = <0x1C00000 0x6400000>;

			reg = <0x02000000 0x06000000>;

		};

	};

};

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+3 −3
Original line number Diff line number Diff line
@@ -178,12 +178,12 @@ 


			qspi_boot: partition@0 {

				label = "Boot and fpga data";

				reg = <0x0 0x034B0000>;

				reg = <0x0 0x03FE0000>;

			};



			qspi_rootfs: partition@4000000 {

			qspi_rootfs: partition@3FE0000 {

				label = "Root Filesystem - JFFS2";

				reg = <0x034B0000 0x0EB50000>;

				reg = <0x03FE0000 0x0C020000>;

			};

		};

	};

arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts

+3 −3
Original line number Diff line number Diff line
@@ -121,12 +121,12 @@ 


			qspi_boot: partition@0 {

				label = "Boot and fpga data";

				reg = <0x0 0x034B0000>;

				reg = <0x0 0x03FE0000>;

			};



			qspi_rootfs: partition@34B0000 {

			qspi_rootfs: partition@3FE0000 {

				label = "Root Filesystem - JFFS2";

				reg = <0x034B0000 0x0EB50000>;

				reg = <0x03FE0000 0x0C020000>;

			};

		};

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE