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, 33 insertions, 27 deletions

diff --git a/target/linux/ramips/dts/R6220.dts b/target/linux/ramips/dts/R6220.dts
index 7ce0cf0660..83ba4531d5 100644
--- a/target/linux/ramips/dts/R6220.dts
+++ b/target/linux/ramips/dts/R6220.dts
@@ -89,38 +89,44 @@
 &nand {
 	status = "okay";
 
-	partition@0 {
-		label = "u-boot";
-		reg = <0x0 0x100000>;
-		read-only;
-	};
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "u-boot";
+			reg = <0x0 0x100000>;
+			read-only;
+		};
 
-	partition@100000 {
-		label = "SC PID";
-		reg = <0x100000 0x100000>;
-		read-only;
-	};
+		partition@100000 {
+			label = "SC PID";
+			reg = <0x100000 0x100000>;
+			read-only;
+		};
 
-	partition@200000 {
-		label = "kernel";
-		reg = <0x200000 0x400000>;
-	};
+		partition@200000 {
+			label = "kernel";
+			reg = <0x200000 0x400000>;
+		};
 
-	partition@600000 {
-		label = "ubi";
-		reg = <0x600000 0x1c00000>;
-	};
+		partition@600000 {
+			label = "ubi";
+			reg = <0x600000 0x1c00000>;
+		};
 
-	factory: partition@2e00000 {
-		label = "factory";
-		reg = <0x2e00000 0x100000>;
-		read-only;
-	};
+		factory: partition@2e00000 {
+			label = "factory";
+			reg = <0x2e00000 0x100000>;
+			read-only;
+		};
 
-	partition@4200000 {
-		label = "reserved";
-		reg = <0x4200000 0x3c00000>;
-		read-only;
+		partition@4200000 {
+			label = "reserved";
+			reg = <0x4200000 0x3c00000>;
+			read-only;
+		};
 	};
 };