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/ASL26555-16M.dts | 74 +++++++++++++++++---------------
 1 file changed, 39 insertions(+), 35 deletions(-)

(limited to 'target/linux/ramips/dts/ASL26555-16M.dts')

diff --git a/target/linux/ramips/dts/ASL26555-16M.dts b/target/linux/ramips/dts/ASL26555-16M.dts
index c61d45b7aa..15352c2f26 100644
--- a/target/linux/ramips/dts/ASL26555-16M.dts
+++ b/target/linux/ramips/dts/ASL26555-16M.dts
@@ -11,51 +11,55 @@
 	status = "okay";
 
 	m25p80@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
 
-		partition@0 {
-			label = "uboot";
-			reg = <0x0 0x30000>;
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition@30000 {
-			label = "uboot-env";
-			reg = <0x30000 0x10000>;
-			read-only;
-		};
+			partition@0 {
+				label = "uboot";
+				reg = <0x0 0x30000>;
+				read-only;
+			};
 
-		partition@40000 {
-			label = "factory";
-			reg = <0x40000 0x10000>;
-			read-only;
-		};
+			partition@30000 {
+				label = "uboot-env";
+				reg = <0x30000 0x10000>;
+				read-only;
+			};
 
-		partition@50000 {
-			label = "firmware";
-			reg = <0x50000 0xf80000>;
-		};
+			partition@40000 {
+				label = "factory";
+				reg = <0x40000 0x10000>;
+				read-only;
+			};
 
-		partition@fd0000 {
-			label = "cert";
-			reg = <0xfd0000 0x10000>;
-			read-only;
-		};
+			partition@50000 {
+				label = "firmware";
+				reg = <0x50000 0xf80000>;
+			};
 
-		partition@fe0000 {
-			label = "langpack";
-			reg = <0xfe0000 0x10000>;
-			read-only;
-		};
+			partition@fd0000 {
+				label = "cert";
+				reg = <0xfd0000 0x10000>;
+				read-only;
+			};
+
+			partition@fe0000 {
+				label = "langpack";
+				reg = <0xfe0000 0x10000>;
+				read-only;
+			};
 
-		devdata: partition@ff0000 {
-			label = "devdata";
-			reg = <0xff0000 0x10000>;
-			read-only;
+			devdata: partition@ff0000 {
+				label = "devdata";
+				reg = <0xff0000 0x10000>;
+				read-only;
+			};
 		};
 	};
 };
-- 
cgit v1.2.3