From 6031ab345df86c285ea55d6523d6888cc596f63d Mon Sep 17 00:00:00 2001
From: Alex Maclean <monkeh@monkeh.net>
Date: Wed, 1 Aug 2018 21:32:34 +0100
Subject: 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>
---
 target/linux/ramips/dts/ki_rb.dts | 146 ++++++++++++++++++++------------------
 1 file changed, 75 insertions(+), 71 deletions(-)

(limited to 'target/linux/ramips/dts/ki_rb.dts')

diff --git a/target/linux/ramips/dts/ki_rb.dts b/target/linux/ramips/dts/ki_rb.dts
index 3fd07e0105..ea4b060777 100644
--- a/target/linux/ramips/dts/ki_rb.dts
+++ b/target/linux/ramips/dts/ki_rb.dts
@@ -86,82 +86,86 @@
 	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 = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition@30000 {
-			label = "u-config";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
-
-		factory: partition@40000 {
-			label = "rf-eeprom";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition@50000 {
-			label = "firmware";
-			reg = <0x50000 0xe90000>;
-		};
-
-		partition@ee0000 {
-			label = "config_1";
-			reg = <0xee0000 0x10000>;
-			read-only;
-		};
-
-		partition@ef0000 {
-			label = "storage";
-			reg = <0xef0000 0x100000>;
-			read-only;
-		};
-
-		partition@ff0000 {
-			label = "dump";
-			reg = <0xff0000 0x10000>;
-			read-only;
-		};
-
-		partition@1000000 {
-			label = "u-state";
-			reg = <0x1000000 0x30000>;
-			read-only;
-		};
-
-		partition@1030000 {
-			label = "u-config_res";
-			reg = <0x1030000 0x10000>;
-			read-only;
-		};
-
-		partition@1040000 {
-			label = "rf-eeprom_res";
-			reg = <0x1040000 0x10000>;
-			read-only;
-		};
-
-		partition@1050000 {
-			label = "firmware_2";
-			reg = <0x1050000 0xe90000>;
-			read-only;
-		};
-
-		partition@1ee0000 {
-			label = "config_2";
-			reg = <0x1ee0000 0x10000>;
-			read-only;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-config";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
+
+			factory: partition@40000 {
+				label = "rf-eeprom";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				label = "firmware";
+				reg = <0x50000 0xe90000>;
+			};
+
+			partition@ee0000 {
+				label = "config_1";
+				reg = <0xee0000 0x10000>;
+				read-only;
+			};
+
+			partition@ef0000 {
+				label = "storage";
+				reg = <0xef0000 0x100000>;
+				read-only;
+			};
+
+			partition@ff0000 {
+				label = "dump";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
+
+			partition@1000000 {
+				label = "u-state";
+				reg = <0x1000000 0x30000>;
+				read-only;
+			};
+
+			partition@1030000 {
+				label = "u-config_res";
+				reg = <0x1030000 0x10000>;
+				read-only;
+			};
+
+			partition@1040000 {
+				label = "rf-eeprom_res";
+				reg = <0x1040000 0x10000>;
+				read-only;
+			};
+
+			partition@1050000 {
+				label = "firmware_2";
+				reg = <0x1050000 0xe90000>;
+				read-only;
+			};
+
+			partition@1ee0000 {
+				label = "config_2";
+				reg = <0x1ee0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
-- 
cgit v1.2.3