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/DCH-M225.dts | 86 +++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 41 deletions(-)

(limited to 'target/linux/ramips/dts/DCH-M225.dts')

diff --git a/target/linux/ramips/dts/DCH-M225.dts b/target/linux/ramips/dts/DCH-M225.dts
index 07e3314963..1e32c6d194 100644
--- a/target/linux/ramips/dts/DCH-M225.dts
+++ b/target/linux/ramips/dts/DCH-M225.dts
@@ -99,52 +99,56 @@
 	status = "okay";
 
 	m25p80@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <80000000>;
 		m25p,fast-read;
 
-		partition@0 {
-			label = "u-boot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
-
-		partition@30000 {
-			label = "u-boot-env";
-			reg = <0x30000 0x4000>;
-			read-only;
-		};
-
-		factory: partition@34000 {
-			label = "factory";
-			reg = <0x34000 0x4000>;
-			read-only;
-		};
-
-		nvram: partition@38000 {
-			label = "nvram";
-			reg = <0x38000 0x8000>;
-			read-only;
-		};
-
-		partition@40000 {
-			label = "devconf";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
-
-		partition@50000 {
-			label = "upgrade_rec";
-			reg = <0x50000 0x100000>;
-			read-only;
-		};
-
-		partition@150000 {
-			label = "firmware";
-			reg = <0x150000 0x6b0000>;
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x30000 0x4000>;
+				read-only;
+			};
+
+			factory: partition@34000 {
+				label = "factory";
+				reg = <0x34000 0x4000>;
+				read-only;
+			};
+
+			nvram: partition@38000 {
+				label = "nvram";
+				reg = <0x38000 0x8000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "devconf";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
+
+			partition@50000 {
+				label = "upgrade_rec";
+				reg = <0x50000 0x100000>;
+				read-only;
+			};
+
+			partition@150000 {
+				label = "firmware";
+				reg = <0x150000 0x6b0000>;
+			};
 		};
 	};
 };
-- 
cgit v1.2.3