arm64: dts: Update NAND MTD partition for Agilex and Stratix 10

Change NAND flash MTD partition in device tree after implementation of
UBI and UBIFS. "u-boot" partition remain for raw u-boot image, but "root"
partition is use for UBI image containing all other components.

Signed-off-by: Sin Hui Kho <sin.hui.kho@intel.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>

diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
index f9b4a39683cf41cbc8938f216fc61c44916e3cd8..bbc3db42d6e837cf9596005e09834cbbd6ff0e37 100644 (file)
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts
@@ -119,28 +119,8 @@
                };
 
                partition@200000 {
-                       label = "env";
-                       reg = <0x200000 0x40000>;
-               };
-
-               partition@240000 {
-                       label = "dtb";
-                       reg = <0x240000 0x40000>;
-               };
-
-               partition@280000 {
-                       label = "kernel";
-                       reg = <0x280000 0x2000000>;
-               };
-
-               partition@2280000 {
-                       label = "misc";
-                       reg = <0x2280000 0x2000000>;
-               };
-
-               partition@4280000 {
-                       label = "rootfs";
-                       reg = <0x4280000 0x3bd80000>;
+                       label = "root";
+                       reg = <0x200000 0x3fe00000>;
                };
        };
 };

diff --git a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts
index cc2dcabf34e3090d3311ce30cf5fc595d7466cf7..57f83481f5518b7ca47bbfde38d54fa9502d9727 100644 (file)
--- a/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts
+++ b/arch/arm64/boot/dts/intel/socfpga_agilex_socdk_nand.dts
@@ -91,24 +91,8 @@
                        reg = <0 0x200000>;
                };
                partition@200000 {
-                       label = "env";
-                       reg = <0x200000 0x40000>;
-               };
-               partition@240000 {
-                       label = "dtb";
-                       reg = <0x240000 0x40000>;
-               };
-               partition@280000 {
-                       label = "kernel";
-                       reg = <0x280000 0x2000000>;
-               };
-               partition@2280000 {
-                       label = "misc";
-                       reg = <0x2280000 0x2000000>;
-               };
-               partition@4280000 {
-                       label = "rootfs";
-                       reg = <0x4280000 0x3bd80000>;
+                       label = "root";
+                       reg = <0x200000 0x3fe00000>;
                };
        };
 };