From 2b17907b3e51572432e908cfad7ba9631cf448c4 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49280 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/lantiq/dts/BTHOMEHUBV2B.dts | 87 ++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 38 deletions(-)

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

diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index 69b977af29..0165156faa 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
@@ -47,29 +47,35 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>; /* 256KB */
-				};
-
-				partition@40000 {
-					label = "uboot_env";
-					reg = <0x40000 0x10000>; /* 64KB */
-				};
-
-				partition@50000 {
-					label = "rg_conf_1";
-					reg = <0x50000 0x10000>;
-				};
-
-				partition@60000 {
-					label = "rg_conf_2";
-					reg = <0x60000 0x10000>;
-				};
-
-				partition@70000 {
-					label = "rg_conf_factory";
-					reg = <0x70000 0x10000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>; /* 256KB */
+					};
+
+					partition@40000 {
+						label = "uboot_env";
+						reg = <0x40000 0x10000>; /* 64KB */
+					};
+
+					partition@50000 {
+						label = "rg_conf_1";
+						reg = <0x50000 0x10000>;
+					};
+
+					partition@60000 {
+						label = "rg_conf_2";
+						reg = <0x60000 0x10000>;
+					};
+
+					partition@70000 {
+						label = "rg_conf_factory";
+						reg = <0x70000 0x10000>;
+					};
 				};
 			};
 
@@ -82,22 +88,27 @@
 				#size-cells = <1>;
 				req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
 
-				ath9k_cal: partition@0 {
-					label = "art";	   /* Atheros 9160 wifi b/g/n radio EEPROM */
-					reg = <0x00000 0x4000>;
-					read-only;
-				};
-
-				partition@4000 {
-					label = "kernel";
-					reg = <0x4000 0x200000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					ath9k_cal: partition@0 {
+						label = "art";	   /* Atheros 9160 wifi b/g/n radio EEPROM */
+						reg = <0x00000 0x4000>;
+						read-only;
+					};
+
+					partition@4000 {
+						label = "kernel";
+						reg = <0x4000 0x200000>;
+					};
+
+					partition@164000 {
+						label = "ubi";
+						reg = <0x204000 0x1DFC000>;
+					};
 				};
-
-				partition@164000 {
-					label = "ubi";
-					reg = <0x204000 0x1DFC000>;
-				};
-
 			};
 
 
-- 
cgit v1.2.3