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, 51 insertions, 47 deletions

diff --git a/target/linux/ramips/dts/WN-AX1167GR.dts b/target/linux/ramips/dts/WN-AX1167GR.dts
index d9fa4d7c8f..3015bdbbec 100644
--- a/target/linux/ramips/dts/WN-AX1167GR.dts
+++ b/target/linux/ramips/dts/WN-AX1167GR.dts
@@ -72,58 +72,62 @@
 	status = "okay";
 
 	m25p80@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
-		partition@0 {
-			label = "Bootloader";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition@30000 {
-			label = "Config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		Factory: partition@40000 {
-			label = "Factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		iNIC_rf: partition@50000 {
-			label = "iNIC_rf";
-			reg = <0x50000 0x10000>;
-			read-only;
-		};
-
-		partition@60000 {
-			label = "firmware";
-			reg = <0x60000 0xf30000>;
-		};
-
-		partition@f90000 {
-			label = "Key";
-			reg = <0xf90000 0x10000>;
-			read-only;
-		};
-
-		partition@fa0000 {
-			label = "backup";
-			reg = <0xfa0000 0x10000>;
-			read-only;
-		};
-
-		partition@fb0000 {
-			label = "storage";
-			reg = <0xfb0000 0x50000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "Bootloader";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "Config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			Factory: partition@40000 {
+				label = "Factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			iNIC_rf: partition@50000 {
+				label = "iNIC_rf";
+				reg = <0x50000 0x10000>;
+				read-only;
+			};
+
+			partition@60000 {
+				label = "firmware";
+				reg = <0x60000 0xf30000>;
+			};
+
+			partition@f90000 {
+				label = "Key";
+				reg = <0xf90000 0x10000>;
+				read-only;
+			};
+
+			partition@fa0000 {
+				label = "backup";
+				reg = <0xfa0000 0x10000>;
+				read-only;
+			};
+
+			partition@fb0000 {
+				label = "storage";
+				reg = <0xfb0000 0x50000>;
+				read-only;
+			};
 		};
 	};
 };