ARM: dts: armada-385-linksys: partition layout is board specific

Move the partition layout to individual boards. The Linksys WRT 3200 ACM
(Rango) comes with a 256MiB nand flash chip and different layout.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

4 files changed, 202 insertions, 63 deletions

diff --git a/arch/arm/boot/dts/armada-385-linksys-caiman.dts b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
index 05e854a14e0c..ee669ae61011 100644
--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
@@ -102,3 +102,70 @@
                 label = "caiman:white:sata";
         };
 };
+
+&nand {
+        /* 128MiB */
+
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x200000>;  /* 2MiB */
+                read-only;
+        };
+
+        partition@100000 {
+                label = "u_env";
+                reg = <0x200000 0x40000>;    /* 256KiB */
+        };
+
+        partition@140000 {
+                label = "s_env";
+                reg = <0x240000 0x40000>;    /* 256KiB */
+        };
+
+        partition@900000 {
+                label = "devinfo";
+                reg = <0x900000 0x100000>;   /* 1MiB */
+                read-only;
+        };
+
+        /* kernel1 overlaps with rootfs1 by design */
+        partition@a00000 {
+                label = "kernel1";
+                reg = <0xa00000 0x2800000>;  /* 40MiB */
+        };
+
+        partition@1000000 {
+                label = "rootfs1";
+                reg = <0x1000000 0x2200000>;  /* 34MiB */
+        };
+
+        /* kernel2 overlaps with rootfs2 by design */
+        partition@3200000 {
+                label = "kernel2";
+                reg = <0x3200000 0x2800000>; /* 40MiB */
+        };
+
+        partition@3800000 {
+                label = "rootfs2";
+                reg = <0x3800000 0x2200000>; /* 34MiB */
+        };
+
+        /*
+         * 38MiB, last MiB is for the BBT, not writable
+         */
+        partition@5a00000 {
+                label = "syscfg";
+                reg = <0x5a00000 0x2600000>;
+        };
+
+        /*
+         * Unused area between "s_env" and "devinfo".
+         * Moved here because otherwise the renumbered
+         * partitions would break the bootloader
+         * supplied bootargs
+         */
+        partition@180000 {
+                label = "unused_area";
+                reg = <0x280000 0x680000>;   /* 6.5MiB */
+        };
+};
diff --git a/arch/arm/boot/dts/armada-385-linksys-cobra.dts b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
index 5b1662b95a58..5169ca89c55a 100644
--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
@@ -102,3 +102,70 @@
                 label = "cobra:white:sata";
         };
 };
+
+&nand {
+        /* 128MiB */
+
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x200000>;  /* 2MiB */
+                read-only;
+        };
+
+        partition@100000 {
+                label = "u_env";
+                reg = <0x200000 0x40000>;    /* 256KiB */
+        };
+
+        partition@140000 {
+                label = "s_env";
+                reg = <0x240000 0x40000>;    /* 256KiB */
+        };
+
+        partition@900000 {
+                label = "devinfo";
+                reg = <0x900000 0x100000>;   /* 1MiB */
+                read-only;
+        };
+
+        /* kernel1 overlaps with rootfs1 by design */
+        partition@a00000 {
+                label = "kernel1";
+                reg = <0xa00000 0x2800000>;  /* 40MiB */
+        };
+
+        partition@1000000 {
+                label = "rootfs1";
+                reg = <0x1000000 0x2200000>;  /* 34MiB */
+        };
+
+        /* kernel2 overlaps with rootfs2 by design */
+        partition@3200000 {
+                label = "kernel2";
+                reg = <0x3200000 0x2800000>; /* 40MiB */
+        };
+
+        partition@3800000 {
+                label = "rootfs2";
+                reg = <0x3800000 0x2200000>; /* 34MiB */
+        };
+
+        /*
+         * 38MiB, last MiB is for the BBT, not writable
+         */
+        partition@5a00000 {
+                label = "syscfg";
+                reg = <0x5a00000 0x2600000>;
+        };
+
+        /*
+         * Unused area between "s_env" and "devinfo".
+         * Moved here because otherwise the renumbered
+         * partitions would break the bootloader
+         * supplied bootargs
+         */
+        partition@180000 {
+                label = "unused_area";
+                reg = <0x280000 0x680000>;   /* 6.5MiB */
+        };
+};
diff --git a/arch/arm/boot/dts/armada-385-linksys-shelby.dts b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
index a90937104b2b..94aa35bc0bff 100644
--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
@@ -102,3 +102,70 @@
                 label = "shelby:white:sata";
         };
 };
+
+&nand {
+        /* 128MiB */
+
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x200000>;  /* 2MiB */
+                read-only;
+        };
+
+        partition@100000 {
+                label = "u_env";
+                reg = <0x200000 0x40000>;    /* 256KiB */
+        };
+
+        partition@140000 {
+                label = "s_env";
+                reg = <0x240000 0x40000>;    /* 256KiB */
+        };
+
+        partition@900000 {
+                label = "devinfo";
+                reg = <0x900000 0x100000>;   /* 1MiB */
+                read-only;
+        };
+
+        /* kernel1 overlaps with rootfs1 by design */
+        partition@a00000 {
+                label = "kernel1";
+                reg = <0xa00000 0x2800000>;  /* 40MiB */
+        };
+
+        partition@1000000 {
+                label = "rootfs1";
+                reg = <0x1000000 0x2200000>;  /* 34MiB */
+        };
+
+        /* kernel2 overlaps with rootfs2 by design */
+        partition@3200000 {
+                label = "kernel2";
+                reg = <0x3200000 0x2800000>; /* 40MiB */
+        };
+
+        partition@3800000 {
+                label = "rootfs2";
+                reg = <0x3800000 0x2200000>; /* 34MiB */
+        };
+
+        /*
+         * 38MiB, last MiB is for the BBT, not writable
+         */
+        partition@5a00000 {
+                label = "syscfg";
+                reg = <0x5a00000 0x2600000>;
+        };
+
+        /*
+         * Unused area between "s_env" and "devinfo".
+         * Moved here because otherwise the renumbered
+         * partitions would break the bootloader
+         * supplied bootargs
+         */
+        partition@180000 {
+                label = "unused_area";
+                reg = <0x280000 0x680000>;   /* 6.5MiB */
+        };
+};
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 4049eaf80638..485abffb4368 100644
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -172,74 +172,12 @@
 };
 
 &nand {
+        /* 128MiB or 256MiB */
         status = "okay";
         num-cs = <1>;
         marvell,nand-keep-config;
         marvell,nand-enable-arbiter;
         nand-on-flash-bbt;
-
-        partition@0 {
-                label = "u-boot";
-                reg = <0x0000000 0x200000>;  /* 2MiB */
-                read-only;
-        };
-
-        partition@100000 {
-                label = "u_env";
-                reg = <0x200000 0x40000>;    /* 256KiB */
-        };
-
-        partition@140000 {
-                label = "s_env";
-                reg = <0x240000 0x40000>;    /* 256KiB */
-        };
-
-        partition@900000 {
-                label = "devinfo";
-                reg = <0x900000 0x100000>;   /* 1MiB */
-                read-only;
-        };
-
-        /* kernel1 overlaps with rootfs1 by design */
-        partition@a00000 {
-                label = "kernel1";
-                reg = <0xa00000 0x2800000>;  /* 40MiB */
-        };
-
-        partition@1000000 {
-                label = "rootfs1";
-                reg = <0x1000000 0x2200000>;  /* 34MiB */
-        };
-
-        /* kernel2 overlaps with rootfs2 by design */
-        partition@3200000 {
-                label = "kernel2";
-                reg = <0x3200000 0x2800000>; /* 40MiB */
-        };
-
-        partition@3800000 {
-                label = "rootfs2";
-                reg = <0x3800000 0x2200000>; /* 34MiB */
-        };
-
-        /*
-         * 38MiB, last MiB is for the BBT, not writable
-         */
-        partition@5a00000 {
-                label = "syscfg";
-                reg = <0x5a00000 0x2600000>;
-        };
-
-        /*
-         * Unused area between "s_env" and "devinfo".
-         * Moved here because otherwise the renumbered
-         * partitions would break the bootloader
-         * supplied bootargs
-         */
-        partition@180000 {
-                label = "unused_area";
-                reg = <0x280000 0x680000>;   /* 6.5MiB */
-        };
 };
 
 &mdio {