From b7fc892eb56b52d25bc00578af9d1ee058dcf6b3 Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 2 May 2016 18:50:18 +0000
Subject: lantiq: move partitions into partion 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: Mathias Kresin <openwrt@kresin.me>

SVN-Revision: 49280
---
 target/linux/lantiq/dts/ACMP252.dts | 67 ++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 31 deletions(-)

(limited to 'target/linux/lantiq/dts/ACMP252.dts')

diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts
index d7d5b32aa5..06b21b61b0 100644
--- a/target/linux/lantiq/dts/ACMP252.dts
+++ b/target/linux/lantiq/dts/ACMP252.dts
@@ -29,38 +29,43 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x20000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x0 0x20000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "uboot_env";
+						reg = <0x20000 0x20000>;
+					};
+
+					partition@40000 {
+						label = "boardconfig";
+						reg = <0x40000 0x60000>;
+						read-only;
+					};
+
+					partition@a0000 {
+						label = "firmware";
+						reg = <0xa0000 0xf20000>;
+					};
+
+					partition@fc0000 {
+						label = "sysconfig";
+						reg = <0xfc0000 0x40000>;
+					};
+
+					partition@0x1000000 {
+						label = "rootfs_data";
+						reg = <0x1000000 0x1000000>;
+					};
 				};
-
-				partition@20000 {
-					label = "uboot_env";
-					reg = <0x20000 0x20000>;
-				};
-
-				partition@40000 {
-					label = "boardconfig";
-					reg = <0x40000 0x60000>;
-					read-only;
-				};
-
-				partition@a0000 {
-					label = "firmware";
-					reg = <0xa0000 0xf20000>;
-				};
-
-				partition@fc0000 {
-					label = "sysconfig";
-					reg = <0xfc0000 0x40000>;
-				};
-
-				partition@0x1000000 {
-					label = "rootfs_data";
-					reg = <0x1000000 0x1000000>;
-				};
-
 			};
 		};
 
-- 
cgit v1.2.3