ramips: move partitions into partition table node

Starting with kernel 4.4, the use of partitions as direct subnodes of the
mtd device is discouraged and only supported for backward compatiblity
reasons.

Signed-off-by: Alex Maclean <monkeh@monkeh.net>

1 files changed, 71 insertions, 65 deletions

diff --git a/target/linux/ramips/dts/MIR3G.dts b/target/linux/ramips/dts/MIR3G.dts
index 9bc28fef58..d9b32c3c49 100644
--- a/target/linux/ramips/dts/MIR3G.dts
+++ b/target/linux/ramips/dts/MIR3G.dts
@@ -86,80 +86,86 @@
 &nand {
 	status = "okay";
 
-	partition@0 {
-		label = "Bootloader";
-		reg = <0x0 0x80000>;
-		read-only;
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "Bootloader";
+			reg = <0x0 0x80000>;
+			read-only;
+		};
 
-	partition@80000 {
-		label = "Config";
-		reg = <0x80000 0x40000>;
-	};
+		partition@80000 {
+			label = "Config";
+			reg = <0x80000 0x40000>;
+		};
 
-	partition@c0000 {
-		label = "Bdata";
-		reg = <0xc0000 0x40000>;
-		read-only;
-	};
+		partition@c0000 {
+			label = "Bdata";
+			reg = <0xc0000 0x40000>;
+			read-only;
+		};
 
-	factory: partition@100000 {
-		label = "Factory";
-		reg = <0x100000 0x40000>;
-		read-only;
-	};
+		factory: partition@100000 {
+			label = "Factory";
+			reg = <0x100000 0x40000>;
+			read-only;
+		};
 
-	partition@140000 {
-		label = "crash";
-		reg = <0x140000 0x40000>;
-	};
+		partition@140000 {
+			label = "crash";
+			reg = <0x140000 0x40000>;
+		};
 
-	partition@180000 {
-		label = "crash_syslog";
-		reg = <0x180000 0x40000>;
-	};
+		partition@180000 {
+			label = "crash_syslog";
+			reg = <0x180000 0x40000>;
+		};
 
-	partition@1c0000 {
-		label = "reserved0";
-		reg = <0x1c0000 0x40000>;
-		read-only;
-	};
+		partition@1c0000 {
+			label = "reserved0";
+			reg = <0x1c0000 0x40000>;
+			read-only;
+		};
 
-	/* uboot expects to find kernels at 0x200000 & 0x600000
-	 * referred to as system 1 & system 2 respectively.
-	 * a kernel is considered suitable for handing control over
-	 * if its linux magic number exists & uImage CRC are correct.
-	 * If either of those conditions fail, a matching sys'n'_fail flag
-	 * is set in uboot env & a restart performed in the hope that the
-	 * alternate kernel is okay.
-	 * if neither kernel checksums ok and both are marked failed, system 2
-	 * is booted anyway.
-	 *
-	 * Note uboot's tftp flash install writes the transferred
-	 * image to both kernel partitions.
-	 */
-
-	partition@200000 {
-		label = "kernel_stock";
-		reg = <0x200000 0x400000>;
-	};
+		/* uboot expects to find kernels at 0x200000 & 0x600000
+		 * referred to as system 1 & system 2 respectively.
+		 * a kernel is considered suitable for handing control over
+		 * if its linux magic number exists & uImage CRC are correct.
+		 * If either of those conditions fail, a matching sys'n'_fail flag
+		 * is set in uboot env & a restart performed in the hope that the
+		 * alternate kernel is okay.
+		 * if neither kernel checksums ok and both are marked failed, system 2
+		 * is booted anyway.
+		 *
+		 * Note uboot's tftp flash install writes the transferred
+		 * image to both kernel partitions.
+		 */
+
+		partition@200000 {
+			label = "kernel_stock";
+			reg = <0x200000 0x400000>;
+		};
 
-	partition@600000 {
-		label = "kernel";
-		reg = <0x600000 0x400000>;
-	};
+		partition@600000 {
+			label = "kernel";
+			reg = <0x600000 0x400000>;
+		};
 
-	/* ubi partition is the result of squashing
-	 * next consecutive stock partitions:
-	 * - rootfs0 (rootfs partition for stock kernel0),
-	 * - rootfs1 (rootfs partition for stock failsafe kernel1),
-	 * - overlay (used as ubi overlay in stock fw)
-	 * resulting 117,5MiB space for packages.
-	 */
-
-	partition@a00000 {
-		label = "ubi";
-		reg = <0xa00000 0x7580000>;
+		/* ubi partition is the result of squashing
+		 * next consecutive stock partitions:
+		 * - rootfs0 (rootfs partition for stock kernel0),
+		 * - rootfs1 (rootfs partition for stock failsafe kernel1),
+		 * - overlay (used as ubi overlay in stock fw)
+		 * resulting 117,5MiB space for packages.
+		 */
+
+		partition@a00000 {
+			label = "ubi";
+			reg = <0xa00000 0x7580000>;
+		};
 	};
 };