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

42 files changed, 1253 insertions, 1006 deletions

diff --git a/target/linux/lantiq/dts/ACMP252.dts b/target/linux/lantiq/dts/ACMP252.dts
index d7d5b32..06b21b6 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>;
-				};
-
 			};
 		};
 
diff --git a/target/linux/lantiq/dts/ARV4510PW.dts b/target/linux/lantiq/dts/ARV4510PW.dts
index 18b2da8..bbfec2f 100644
--- a/target/linux/lantiq/dts/ARV4510PW.dts
+++ b/target/linux/lantiq/dts/ARV4510PW.dts
@@ -42,21 +42,27 @@
 
 				lantiq,noxip;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-					read-only;
-				};
-
-				partition@40000 {
-					label = "uboot_env";
-					reg = <0x40000 0x20000>;
-					read-only;
-				};
-
-				partition@60000 {
-					label = "firmware";
-					reg = <0x60000 0xfa0000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+						read-only;
+					};
+
+					partition@40000 {
+						label = "uboot_env";
+						reg = <0x40000 0x20000>;
+						read-only;
+					};
+
+					partition@60000 {
+						label = "firmware";
+						reg = <0x60000 0xfa0000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/ARV4518PWR01.dtsi b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
index e72eb6d..4a3eb05 100644
--- a/target/linux/lantiq/dts/ARV4518PWR01.dtsi
+++ b/target/linux/lantiq/dts/ARV4518PWR01.dtsi
@@ -36,27 +36,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>; /* 64 KB */
-					read-only;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>; /* 64 KB */
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x3d0000>;
-				};
-
-				partition@400000 {
-					label = "boardconfig";
-					reg = <0x3f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>; /* 64 KB */
+						read-only;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>; /* 64 KB */
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x3d0000>;
+					};
+
+					partition@400000 {
+						label = "boardconfig";
+						reg = <0x3f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV4519PW.dts b/target/linux/lantiq/dts/ARV4519PW.dts
index 5e0b846..d6b6da3 100644
--- a/target/linux/lantiq/dts/ARV4519PW.dts
+++ b/target/linux/lantiq/dts/ARV4519PW.dts
@@ -40,26 +40,32 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>;
-					read-only;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x3d0000>;
-				};
-
-				partition@3f0000 {
-					label = "boardconfig";
-					reg = <0x3f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>;
+						read-only;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x3d0000>;
+					};
+
+					partition@3f0000 {
+						label = "boardconfig";
+						reg = <0x3f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV4520PW.dts b/target/linux/lantiq/dts/ARV4520PW.dts
index 75665b9..299d13c 100644
--- a/target/linux/lantiq/dts/ARV4520PW.dts
+++ b/target/linux/lantiq/dts/ARV4520PW.dts
@@ -41,27 +41,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x20000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "uboot_env";
-					reg = <0x20000 0x10000>;
-					read-only;
-				};
-
-				partition@30000 {
-					label = "firmware";
-					reg = <0x30000 0x3c0000>;
-				};
-
-				partition@7f0000 {
-					label = "boardconfig";
-					reg = <0x3f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x20000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "uboot_env";
+						reg = <0x20000 0x10000>;
+						read-only;
+					};
+
+					partition@30000 {
+						label = "firmware";
+						reg = <0x30000 0x3c0000>;
+					};
+
+					partition@7f0000 {
+						label = "boardconfig";
+						reg = <0x3f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV4525PW.dts b/target/linux/lantiq/dts/ARV4525PW.dts
index 92e6758..6a7ca62 100644
--- a/target/linux/lantiq/dts/ARV4525PW.dts
+++ b/target/linux/lantiq/dts/ARV4525PW.dts
@@ -37,27 +37,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>;
-					read-only;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x3d0000>;
-				};
-
-				partition@400000 {
-					label = "boardconfig";
-					reg = <0x3f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>;
+						read-only;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x3d0000>;
+					};
+
+					partition@400000 {
+						label = "boardconfig";
+						reg = <0x3f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV452CQW.dts b/target/linux/lantiq/dts/ARV452CQW.dts
index 78f00d6..57aa864 100644
--- a/target/linux/lantiq/dts/ARV452CQW.dts
+++ b/target/linux/lantiq/dts/ARV452CQW.dts
@@ -40,27 +40,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>;
-					read-only;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x3d0000>;
-				};
-
-				partition@3f0000 {
-					label = "boardconfig";
-					reg = <0x3f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>;
+						read-only;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x3d0000>;
+					};
+
+					partition@3f0000 {
+						label = "boardconfig";
+						reg = <0x3f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV7510PW22.dts b/target/linux/lantiq/dts/ARV7510PW22.dts
index c92c393..16b4fb4 100644
--- a/target/linux/lantiq/dts/ARV7510PW22.dts
+++ b/target/linux/lantiq/dts/ARV7510PW22.dts
@@ -38,27 +38,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-					read-only;
-				};
-
-				partition@40000 {
-					label = "uboot_env";
-					reg = <0x40000 0x20000>;
-					read-only;
-				};
-
-				partition@60000 {
-					label = "firmware";
-					reg = <0x60000 0xf80000>;
-				};
-
-				partition@fe0000 {
-					label = "board_config";
-					reg = <0xfe0000 0x20000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+						read-only;
+					};
+
+					partition@40000 {
+						label = "uboot_env";
+						reg = <0x40000 0x20000>;
+						read-only;
+					};
+
+					partition@60000 {
+						label = "firmware";
+						reg = <0x60000 0xf80000>;
+					};
+
+					partition@fe0000 {
+						label = "board_config";
+						reg = <0xfe0000 0x20000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV7518PW.dts b/target/linux/lantiq/dts/ARV7518PW.dts
index ec08b29..19a7442 100644
--- a/target/linux/lantiq/dts/ARV7518PW.dts
+++ b/target/linux/lantiq/dts/ARV7518PW.dts
@@ -39,26 +39,32 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>;
-					read-only;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x7d0000>;
-				};
-
-				partition@400000 {
-					label = "boardconfig";
-					reg = <0x7f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>;
+						read-only;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x7d0000>;
+					};
+
+					partition@400000 {
+						label = "boardconfig";
+						reg = <0x7f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV7519PW.dts b/target/linux/lantiq/dts/ARV7519PW.dts
index c60f04e..b917b2d 100644
--- a/target/linux/lantiq/dts/ARV7519PW.dts
+++ b/target/linux/lantiq/dts/ARV7519PW.dts
@@ -38,26 +38,32 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-					read-only;
-				};
-
-				partition@40000 {
-					label = "uboot_env";
-					reg = <0x40000 0x20000>;
-				};
-
-				partition@60000 {
-					label = "firmware";
-					reg = <0x60000 0xf80000>;
-				};
-
-				partition@fe0000 {
-					label = "board_config";
-					reg = <0xfe0000 0x20000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+						read-only;
+					};
+
+					partition@40000 {
+						label = "uboot_env";
+						reg = <0x40000 0x20000>;
+					};
+
+					partition@60000 {
+						label = "firmware";
+						reg = <0x60000 0xf80000>;
+					};
+
+					partition@fe0000 {
+						label = "board_config";
+						reg = <0xfe0000 0x20000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
index 6f5d356..a15556b 100644
--- a/target/linux/lantiq/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -30,27 +30,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x60000>;
-					read-only;
-				};
-
-				partition@60000 {
-					label = "uboot-env";
-					reg = <0x60000 0x20000>;
-					read-only;
-				};
-
-				partition@80000 {
-					label = "firmware";
-					reg = <0x80000 0x1f00000>;
-				};
-
-				boardconfig: partition@1f80000 {
-					label = "boardconfig";
-					reg = <0x1f80000 0x80000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x0 0x60000>;
+						read-only;
+					};
+
+					partition@60000 {
+						label = "uboot-env";
+						reg = <0x60000 0x20000>;
+						read-only;
+					};
+
+					partition@80000 {
+						label = "firmware";
+						reg = <0x80000 0x1f00000>;
+					};
+
+					boardconfig: partition@1f80000 {
+						label = "boardconfig";
+						reg = <0x1f80000 0x80000>;
+						read-only;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/ARV7525PW.dts b/target/linux/lantiq/dts/ARV7525PW.dts
index 2270893..62ae62b 100644
--- a/target/linux/lantiq/dts/ARV7525PW.dts
+++ b/target/linux/lantiq/dts/ARV7525PW.dts
@@ -39,27 +39,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>;
-					read-only;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x3d0000>;
-				};
-
-				partition@400000 {
-					label = "board_config";
-					reg = <0x3f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>;
+						read-only;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x3d0000>;
+					};
+
+					partition@400000 {
+						label = "board_config";
+						reg = <0x3f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV752DPW.dts b/target/linux/lantiq/dts/ARV752DPW.dts
index 134680b..d4b5767 100644
--- a/target/linux/lantiq/dts/ARV752DPW.dts
+++ b/target/linux/lantiq/dts/ARV752DPW.dts
@@ -38,27 +38,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>;
-					read-only;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x7d0000>;
-				};
-
-				partition@7f0000 {
-					label = "board_config";
-					reg = <0x7f0000 0x10000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>;
+						read-only;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x7d0000>;
+					};
+
+					partition@7f0000 {
+						label = "board_config";
+						reg = <0x7f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV752DPW22.dts b/target/linux/lantiq/dts/ARV752DPW22.dts
index aec5f7e..efe4257 100644
--- a/target/linux/lantiq/dts/ARV752DPW22.dts
+++ b/target/linux/lantiq/dts/ARV752DPW22.dts
@@ -38,27 +38,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x30000>;
-					read-only;
-				};
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x30000 0x10000>;
-					read-only;
-				};
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x30000>;
+						read-only;
+					};
 
-				partition@20000 {
-					label = "firmware";
-					reg = <0x40000 0x7b0000>;
-				};
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x30000 0x10000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x40000 0x7b0000>;
+					};
 
-				partition@7f0000 {
-					label = "board_config";
-					reg = <0x7f0000 0x10000>;
-					read-only;
+					partition@7f0000 {
+						label = "board_config";
+						reg = <0x7f0000 0x10000>;
+						read-only;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/ARV8539PW22.dts b/target/linux/lantiq/dts/ARV8539PW22.dts
index 9e1b441..9f9db82 100644
--- a/target/linux/lantiq/dts/ARV8539PW22.dts
+++ b/target/linux/lantiq/dts/ARV8539PW22.dts
@@ -3,176 +3,181 @@
 /include/ "danube.dtsi"
 
 / {
-        model = "ARV8539PW22 - Speedport W 504V Typ A";
-
-	    chosen {
-		    leds {
-                boot = &power_green;
-                failsafe = &power_red;
-                running = &power_green;
-
-			    dsl = &dsl_green;
-			    internet = &online_green;
-			    wifi = &wireless_green;
-		    };
-	    };
+	model = "ARV8539PW22 - Speedport W 504V Typ A";
+
+    chosen {
+	    leds {
+			boot = &power_green;
+			failsafe = &power_red;
+			running = &power_green;
 
-        memory@0 {
-                reg = <0x0 0x4000000>;
-        };
-
-        sram@1F000000 {
-                vmmc@107000 {
-                        status = "okay";
-                        gpios = <&gpio 31 0>;
-                };
-        };
-
-        fpi@10000000 {
-                localbus@0 {
-                        nor-boot@0 {
-                                compatible = "lantiq,nor";
-                                bank-width = <2>;
-                                reg = <0 0x0 0x800000>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-
-                                partition@0 {
-                                        label = "uboot";
-                                        reg = <0x00000 0x30000>;        /* 192 KiB */
-                                        read-only;
-                                };
-
-                                partition@30000 {
-                                        label = "uboot";
-                                        reg = <0x30000 0x10000>;        /* 64 KiB */
-                                        read-only;
-                                };
-
-                                partition@40000 {
-                                        label = "firmware";
-                                        reg = <0x40000 0x7B0000>;       /* 7872 KiB */
-                                };
-
-                                partition@7F0000 {
-                                        label = "art";
-                                        reg = <0x7F0000 0x10000>;       /* 64 KiB*/
-                                        read-only;
-                                };
-                        };
-
-                        mac_addr {
-                                compatible = "lantiq,eth-mac";
-                                reg = <0 0x7f0016 0x6>;
-                                mac-increment = <2>;
-                        };
-
-                        ath9k_eep {
-                                compatible = "ath9k,eeprom";
-                                reg = <0 0x7f0400 0x1000
-                                        0 0x7f0016 0x6>;
-                                ath,mac-increment = <1>;
-                                ath,pci-slot = <14>;
-                                ath,eep-endian;
-                                ath,arv-ath9k-fix;
-                        };
-                };
-
-                gpio: pinmux@E100B10 {
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&state_default>;
-
-                        state_default: pinmux {
-
-                                pci_in {
-                                        lantiq,groups = "req1";
-                                        lantiq,function = "pci";
-                                        lantiq,open-drain = <1>;
-                                        lantiq,pull = <2>;
-                                        lantiq,output = <0>;
-                                };
-                                pci_out {
-                                        lantiq,groups = "gnt1";
-                                        lantiq,function = "pci";
-                                        lantiq,output = <1>;
-                                };
-                                pci_rst {
-                                        lantiq,pins = "io21";
-                                        lantiq,pull = <2>;
-                                        lantiq,output = <1>;
-                                };
-                                relay {
-                                        lantiq,pins = "io31";
-                                        lantiq,output = <1>;
-                                };
-                        };
-                };
-
-                etop@E180000 {
-                        phy-mode = "mii";
-                };
-
-                pci@E105400 {
-                        status = "okay";
-                        gpio-reset = <&gpio 21 0>;
-                };
-
-                ifxhcd@E101000 {
-                        status = "okay";
-                        gpios = <&gpio 14 0>;
-                        lantiq,portmask = <0x3>;
-                };
-
-        };
-
-        gpio-keys-polled {
-                compatible = "gpio-keys-polled";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                poll-interval = <100>;
-
-                wlan {
-                        label = "wlan";
-                        gpios = <&gpio 29 1>;
-                        linux,code = <0x211>;
-                };
-                reset {
-                        label = "reset";
-                        gpios = <&gpio 30 1>;
-                        linux,code = <0x198>;
-                };
-        };
-
-        gpio-leds {
-                compatible = "gpio-leds";
-
-                power_green: power-green {
-                        label = "arv8539pw22:green:power";
-                        gpios = <&gpio 24 1>;
-                        default-state = "keep";
-                };
-                power_red: power-red {
-                        label = "arv8539pw22:red:power";
-                        gpios = <&gpio 4 1>;
-                };
-
-                dsl_green: dsl-green {
-                        label = "arv8539pw22:green:dsl";
-                        gpios = <&gpio 5 1>;
-                };
-
-                online_green: online-green {
-                        label = "arv8539pw22:green:online";
-                        gpios = <&gpio 6 1>;
-                };
-
-                wireless_green: wireless-green {
-                        label = "arv8539pw22:green:wlan";
-                        gpios = <&gpio 8 1>;
-                };
-                /*
-                        telefonie green is missing
-                */
-        };
+		    dsl = &dsl_green;
+		    internet = &online_green;
+		    wifi = &wireless_green;
+	    };
+    };
+
+	memory@0 {
+		reg = <0x0 0x4000000>;
+	};
+
+	sram@1F000000 {
+		vmmc@107000 {
+			status = "okay";
+			gpios = <&gpio 31 0>;
+		};
+	};
+
+	fpi@10000000 {
+		localbus@0 {
+			nor-boot@0 {
+				compatible = "lantiq,nor";
+				bank-width = <2>;
+				reg = <0 0x0 0x800000>;
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x30000>;	/* 192 KiB */
+						read-only;
+					};
+
+					partition@30000 {
+						label = "uboot";
+						reg = <0x30000 0x10000>;	/* 64 KiB */
+						read-only;
+					};
+
+					partition@40000 {
+						label = "firmware";
+						reg = <0x40000 0x7B0000>;       /* 7872 KiB */
+					};
+
+					partition@7F0000 {
+						label = "art";
+						reg = <0x7F0000 0x10000>;       /* 64 KiB*/
+						read-only;
+					};
+				};
+			};
+
+			mac_addr {
+				compatible = "lantiq,eth-mac";
+				reg = <0 0x7f0016 0x6>;
+				mac-increment = <2>;
+			};
+
+			ath9k_eep {
+				compatible = "ath9k,eeprom";
+				reg = <0 0x7f0400 0x1000
+					0 0x7f0016 0x6>;
+				ath,mac-increment = <1>;
+				ath,pci-slot = <14>;
+				ath,eep-endian;
+				ath,arv-ath9k-fix;
+			};
+		};
+
+		gpio: pinmux@E100B10 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&state_default>;
+
+			state_default: pinmux {
+				pci_in {
+					lantiq,groups = "req1";
+					lantiq,function = "pci";
+					lantiq,open-drain = <1>;
+					lantiq,pull = <2>;
+					lantiq,output = <0>;
+				};
+				pci_out {
+					lantiq,groups = "gnt1";
+					lantiq,function = "pci";
+					lantiq,output = <1>;
+				};
+				pci_rst {
+					lantiq,pins = "io21";
+					lantiq,pull = <2>;
+					lantiq,output = <1>;
+				};
+				relay {
+					lantiq,pins = "io31";
+					lantiq,output = <1>;
+				};
+			};
+		};
+
+		etop@E180000 {
+			phy-mode = "mii";
+		};
+
+		pci@E105400 {
+			status = "okay";
+			gpio-reset = <&gpio 21 0>;
+		};
+
+		ifxhcd@E101000 {
+			status = "okay";
+			gpios = <&gpio 14 0>;
+			lantiq,portmask = <0x3>;
+		};
+
+	};
+
+	gpio-keys-polled {
+		compatible = "gpio-keys-polled";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		poll-interval = <100>;
+
+		wlan {
+			label = "wlan";
+			gpios = <&gpio 29 1>;
+			linux,code = <0x211>;
+		};
+		reset {
+			label = "reset";
+			gpios = <&gpio 30 1>;
+			linux,code = <0x198>;
+		};
+	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		power_green: power-green {
+			label = "arv8539pw22:green:power";
+			gpios = <&gpio 24 1>;
+			default-state = "keep";
+		};
+		power_red: power-red {
+			label = "arv8539pw22:red:power";
+			gpios = <&gpio 4 1>;
+		};
+
+		dsl_green: dsl-green {
+			label = "arv8539pw22:green:dsl";
+			gpios = <&gpio 5 1>;
+		};
+
+		online_green: online-green {
+			label = "arv8539pw22:green:online";
+			gpios = <&gpio 6 1>;
+		};
+
+		wireless_green: wireless-green {
+			label = "arv8539pw22:green:wlan";
+			gpios = <&gpio 8 1>;
+		};
+		/*
+			telefonie green is missing
+		*/
+	};
 };
 
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV2B.dts b/target/linux/lantiq/dts/BTHOMEHUBV2B.dts
index 69b977a..0165156 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>;
-				};
-
 			};
 
 
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
index 1bf514b..595668f 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV3A.dts
@@ -48,31 +48,37 @@
 				#size-cells = <1>;
 				req-mask = <0x1>;  /* PCI request lines to mask during NAND access */
 
-				partition@0 {
-					label = "preboot";
-					reg = <0x00000 0x8000>;
-					read-only;
-				};
-				partition@8000 {
-					label = "u-boot";
-					reg = <0x8000 0x05c000>;
-					read-only;
-				};
-				partition@64000 {
-					label = "uboot-config";
-					reg = <0x64000 0x004000>;
-				};
-				ath9k_cal: partition@68000 {
-					label = "art-copy";
-					reg = <0x68000 0x004000>;
-				};
-				partition@6c000 {
-					label = "kernel";
-					reg = <0x6c000 0x200000>;
-				};
-				partition@26c000 {
-					label = "ubi";
-					reg = <0x26c000 0x1d94000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "preboot";
+						reg = <0x00000 0x8000>;
+						read-only;
+					};
+					partition@8000 {
+						label = "u-boot";
+						reg = <0x8000 0x05c000>;
+						read-only;
+					};
+					partition@64000 {
+						label = "uboot-config";
+						reg = <0x64000 0x004000>;
+					};
+					ath9k_cal: partition@68000 {
+						label = "art-copy";
+						reg = <0x68000 0x004000>;
+					};
+					partition@6c000 {
+						label = "kernel";
+						reg = <0x6c000 0x200000>;
+					};
+					partition@26c000 {
+						label = "ubi";
+						reg = <0x26c000 0x1d94000>;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
index 9283f62..e62a18d 100644
--- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
@@ -32,27 +32,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "u-boot";
-					reg = <0x0 0x40000>;
-					read-only;
-				};
-				partition@40000 {
-					label = "uboot-env";
-					reg = <0x40000 0x40000>;
-				};
-				caldata: partition@80000 {
-					label = "caldata";
-					reg = <0x80000 0x20000>;
-					read-only;
-				};
-				partition@a0000 {
-					label = "kernel";
-					reg = <0xa0000 0x200000>;
-				};
-				partition@2a0000 {
-					label = "ubi";
-					reg = <0x2a0000 0x7d60000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "u-boot";
+						reg = <0x0 0x40000>;
+						read-only;
+					};
+					partition@40000 {
+						label = "uboot-env";
+						reg = <0x40000 0x40000>;
+					};
+					caldata: partition@80000 {
+						label = "caldata";
+						reg = <0x80000 0x20000>;
+						read-only;
+					};
+					partition@a0000 {
+						label = "kernel";
+						reg = <0xa0000 0x200000>;
+					};
+					partition@2a0000 {
+						label = "ubi";
+						reg = <0x2a0000 0x7d60000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/DGN1000B.dts b/target/linux/lantiq/dts/DGN1000B.dts
index 68415ca..a011c71 100644
--- a/target/linux/lantiq/dts/DGN1000B.dts
+++ b/target/linux/lantiq/dts/DGN1000B.dts
@@ -68,33 +68,39 @@
 				reg = <1 0>;
 				spi-max-frequency = <5000000>;
 
-				partition@0 {
-					reg = <0x0 0x20000>;
-					label = "SPI (RO) U-Boot Image";
-					read-only;
-				};
-
-				partition@20000 {
-					reg = <0x20000 0x10000>;
-					label = "ENV_MAC";
-					read-only;
-				};
-
-				partition@30000 {
-					reg = <0x30000 0x10000>;
-					label = "DPF";
-					read-only;
-				};
-
-				partition@40000 {
-					reg = <0x40000 0x10000>;
-					label = "NVRAM";
-					read-only;
-				};
-
-				partition@500000 {
-					reg = <0x50000 0x003a0000>;
-					label = "kernel";
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						reg = <0x0 0x20000>;
+						label = "SPI (RO) U-Boot Image";
+						read-only;
+					};
+
+					partition@20000 {
+						reg = <0x20000 0x10000>;
+						label = "ENV_MAC";
+						read-only;
+					};
+
+					partition@30000 {
+						reg = <0x30000 0x10000>;
+						label = "DPF";
+						read-only;
+					};
+
+					partition@40000 {
+						reg = <0x40000 0x10000>;
+						label = "NVRAM";
+						read-only;
+					};
+
+					partition@500000 {
+						reg = <0x50000 0x003a0000>;
+						label = "kernel";
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/DGN3500.dtsi b/target/linux/lantiq/dts/DGN3500.dtsi
index 48e2471e4..89a7737 100644
--- a/target/linux/lantiq/dts/DGN3500.dtsi
+++ b/target/linux/lantiq/dts/DGN3500.dtsi
@@ -170,27 +170,33 @@
 		reg = <4 0>;
 		spi-max-frequency = <1000000>;
 
-		partition@0 {
-			reg = <0x0 0x10000>;
-			label = "uboot";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x0 0x10000>;
+				label = "uboot";
+				read-only;
+			};
 
-		partition@10000 {
-			reg = <0x10000 0x10000>;
-			label = "uboot-env";
-			read-only;
-		};
+			partition@10000 {
+				reg = <0x10000 0x10000>;
+				label = "uboot-env";
+				read-only;
+			};
 
-		ath9k_cal: partition@20000 {
-			reg = <0x20000 0x10000>;
-			label = "calibration";
-			read-only;
-		};
+			ath9k_cal: partition@20000 {
+				reg = <0x20000 0x10000>;
+				label = "calibration";
+				read-only;
+			};
 
-		partition@50000 {
-			reg = <0x50000 0xfa0000>;
-			label = "firmware";
+			partition@50000 {
+				reg = <0x50000 0xfa0000>;
+				label = "firmware";
+			};
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/EASY50712.dts b/target/linux/lantiq/dts/EASY50712.dts
index e44267a..39ba1f7 100644
--- a/target/linux/lantiq/dts/EASY50712.dts
+++ b/target/linux/lantiq/dts/EASY50712.dts
@@ -28,24 +28,30 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>; /* 64 KB */
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>; /* 64 KB */
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x3d0000>;
-				};
-
-				partition@400000 {
-					label = "rootfs";
-					reg = <0x400000 0x400000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>; /* 64 KB */
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>; /* 64 KB */
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x3d0000>;
+					};
+
+					partition@400000 {
+						label = "rootfs";
+						reg = <0x400000 0x400000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/EASY50810.dts b/target/linux/lantiq/dts/EASY50810.dts
index 5f4b733..70d2ff5 100644
--- a/target/linux/lantiq/dts/EASY50810.dts
+++ b/target/linux/lantiq/dts/EASY50810.dts
@@ -28,24 +28,30 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>; /* 64 KB */
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>; /* 64 KB */
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x3d0000>;
-				};
-
-				partition@400000 {
-					label = "rootfs";
-					reg = <0x400000 0x400000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>; /* 64 KB */
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>; /* 64 KB */
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x3d0000>;
+					};
+
+					partition@400000 {
+						label = "rootfs";
+						reg = <0x400000 0x400000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/EASY80920.dtsi b/target/linux/lantiq/dts/EASY80920.dtsi
index 44723a1..e8cbc42 100644
--- a/target/linux/lantiq/dts/EASY80920.dtsi
+++ b/target/linux/lantiq/dts/EASY80920.dtsi
@@ -222,33 +222,39 @@
 		reg = <4 0>;
 		spi-max-frequency = <1000000>;
 
-		partition@0 {
-			reg = <0x0 0x20000>;
-			label = "SPI (RO) U-Boot Image";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition@20000 {
-			reg = <0x20000 0x10000>;
-			label = "ENV_MAC";
-			read-only;
-		};
+			partition@0 {
+				reg = <0x0 0x20000>;
+				label = "SPI (RO) U-Boot Image";
+				read-only;
+			};
 
-		partition@30000 {
-			reg = <0x30000 0x10000>;
-			label = "DPF";
-			read-only;
-		};
+			partition@20000 {
+				reg = <0x20000 0x10000>;
+				label = "ENV_MAC";
+				read-only;
+			};
 
-		partition@40000 {
-			reg = <0x40000 0x10000>;
-			label = "NVRAM";
-			read-only;
-		};
+			partition@30000 {
+				reg = <0x30000 0x10000>;
+				label = "DPF";
+				read-only;
+			};
 
-		partition@500000 {
-			reg = <0x50000 0x003a0000>;
-			label = "kernel";
+			partition@40000 {
+				reg = <0x40000 0x10000>;
+				label = "NVRAM";
+				read-only;
+			};
+
+			partition@500000 {
+				reg = <0x50000 0x003a0000>;
+				label = "kernel";
+			};
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/EASY80920NAND.dts b/target/linux/lantiq/dts/EASY80920NAND.dts
index 88fbcaa..d7e04ee 100644
--- a/target/linux/lantiq/dts/EASY80920NAND.dts
+++ b/target/linux/lantiq/dts/EASY80920NAND.dts
@@ -15,19 +15,25 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-				};
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x40000 0x40000>;
-				};
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x40000 0x40000>;
+					};
 
-				partition@20000 {
-					label = "firmware";
-					reg = <0x80000 0x3f80000>;
+					partition@20000 {
+						label = "firmware";
+						reg = <0x80000 0x3f80000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/EASY80920NOR.dts b/target/linux/lantiq/dts/EASY80920NOR.dts
index 212ad5c..54d2fa9 100644
--- a/target/linux/lantiq/dts/EASY80920NOR.dts
+++ b/target/linux/lantiq/dts/EASY80920NOR.dts
@@ -14,19 +14,25 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x10000>;
-				};
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x10000 0x10000>;
-				};
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x10000>;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x10000 0x10000>;
+					};
 
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0x7e0000>;
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0x7e0000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/FRITZ3370.dts b/target/linux/lantiq/dts/FRITZ3370.dts
index aae5283..d802ca7 100644
--- a/target/linux/lantiq/dts/FRITZ3370.dts
+++ b/target/linux/lantiq/dts/FRITZ3370.dts
@@ -32,31 +32,37 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "kernel";
-					reg = <0x0 0x400000>;
-				};
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
 
-				partition@400000 {
-					label = "rootfs_ubi";
-					reg = <0x400000 0x3000000>;
-				};
+					partition@0 {
+						label = "kernel";
+						reg = <0x0 0x400000>;
+					};
 
-				partition@3400000 {
-					label = "vr9_firmware";
-					reg = <0x3400000 0x400000>;
-				};
-				partition@3800000 {
-					label = "reserved";
-					reg = <0x3800000 0x3000000>;
-				};
-				partition@6800000 {
-					label = "config";
-					reg = <0x6800000 0x200000>;
-				};
-				partition@6a00000 {
-					label = "nand-filesystem";
-					reg = <0x6a00000 0x1600000>;
+					partition@400000 {
+						label = "rootfs_ubi";
+						reg = <0x400000 0x3000000>;
+					};
+
+					partition@3400000 {
+						label = "vr9_firmware";
+						reg = <0x3400000 0x400000>;
+					};
+					partition@3800000 {
+						label = "reserved";
+						reg = <0x3800000 0x3000000>;
+					};
+					partition@6800000 {
+						label = "config";
+						reg = <0x6800000 0x200000>;
+					};
+					partition@6a00000 {
+						label = "nand-filesystem";
+						reg = <0x6a00000 0x1600000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/FRITZ7320.dts b/target/linux/lantiq/dts/FRITZ7320.dts
index 8140b68..475da7a 100644
--- a/target/linux/lantiq/dts/FRITZ7320.dts
+++ b/target/linux/lantiq/dts/FRITZ7320.dts
@@ -32,27 +32,33 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "urlader";
-					reg = <0x00000 0x20000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x20000 0xf60000>;
-				};
-
-				partition@f80000 {
-					label = "tffs (1)";
-					reg = <0xf80000 0x40000>;
-					read-only;
-				};
-
-				partition@fc0000 {
-					label = "tffs (2)";
-					reg = <0xfc0000 0x40000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "urlader";
+						reg = <0x00000 0x20000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x20000 0xf60000>;
+					};
+
+					partition@f80000 {
+						label = "tffs (1)";
+						reg = <0xf80000 0x40000>;
+						read-only;
+					};
+
+					partition@fc0000 {
+						label = "tffs (2)";
+						reg = <0xfc0000 0x40000>;
+						read-only;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/GIGASX76X.dts b/target/linux/lantiq/dts/GIGASX76X.dts
index b4bb956..a43e4d4 100644
--- a/target/linux/lantiq/dts/GIGASX76X.dts
+++ b/target/linux/lantiq/dts/GIGASX76X.dts
@@ -29,19 +29,25 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x30000>;
-				};
-
-				partition@10000 {
-					label = "uboot_env";
-					reg = <0x30000 0x10000>;
-				};
-
-				partition@40000 {
-					label = "firmware";
-					reg = <0x40000 0x7c0000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x0 0x30000>;
+					};
+
+					partition@10000 {
+						label = "uboot_env";
+						reg = <0x30000 0x10000>;
+					};
+
+					partition@40000 {
+						label = "firmware";
+						reg = <0x40000 0x7c0000>;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/GR7000.dts b/target/linux/lantiq/dts/GR7000.dts
index 27c9f4a..220eb47 100644
--- a/target/linux/lantiq/dts/GR7000.dts
+++ b/target/linux/lantiq/dts/GR7000.dts
@@ -31,21 +31,27 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x20000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "uboot_env";
-					reg = <0x20000 0x10000>;
-					read-only;
-				};
-
-				partition@30000 {
-					label = "firmware";
-					reg = <0x30000 0x7d0000>;
+				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 0x10000>;
+						read-only;
+					};
+
+					partition@30000 {
+						label = "firmware";
+						reg = <0x30000 0x7d0000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/H201L.dts b/target/linux/lantiq/dts/H201L.dts
index cab2966..e6e514f 100644
--- a/target/linux/lantiq/dts/H201L.dts
+++ b/target/linux/lantiq/dts/H201L.dts
@@ -33,21 +33,27 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x20000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "uboot_env";
-					reg = <0x20000 0x10000>;
-					read-only;
-				};
-
-				partition@30000 {
-					label = "firmware";
-					reg = <0x30000 0x7d0000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x20000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "uboot_env";
+						reg = <0x20000 0x10000>;
+						read-only;
+					};
+
+					partition@30000 {
+						label = "firmware";
+						reg = <0x30000 0x7d0000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/P2601HNFX.dts b/target/linux/lantiq/dts/P2601HNFX.dts
index 7e70c2c..c1b4c61 100644
--- a/target/linux/lantiq/dts/P2601HNFX.dts
+++ b/target/linux/lantiq/dts/P2601HNFX.dts
@@ -40,21 +40,27 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-					read-only;
-				};
-
-				partition@40000 {
-					label = "uboot_env";
-					reg = <0x40000 0x20000>;
-					read-only;
-				};
-
-				partition@60000 {
-					label = "firmware";
-					reg = <0x60000 0xfa0000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+						read-only;
+					};
+
+					partition@40000 {
+						label = "uboot_env";
+						reg = <0x40000 0x20000>;
+						read-only;
+					};
+
+					partition@60000 {
+						label = "firmware";
+						reg = <0x60000 0xfa0000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/P2812HNUF1.dts b/target/linux/lantiq/dts/P2812HNUF1.dts
index 317499b..10bc4b1 100644
--- a/target/linux/lantiq/dts/P2812HNUF1.dts
+++ b/target/linux/lantiq/dts/P2812HNUF1.dts
@@ -22,21 +22,27 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-				};
-				partition@40000 {
-					label = "uboot-env";
-					reg = <0x40000 0x20000>;
-				};
-				partition@60000 {
-					label = "kernel";
-					reg = <0x60000 0x200000>;
-				};
-				partition@260000 {
-					label = "ubi";
-					reg = <0x260000 0x7da0000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+					};
+					partition@40000 {
+						label = "uboot-env";
+						reg = <0x40000 0x20000>;
+					};
+					partition@60000 {
+						label = "kernel";
+						reg = <0x60000 0x200000>;
+					};
+					partition@260000 {
+						label = "ubi";
+						reg = <0x260000 0x7da0000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/P2812HNUF3.dts b/target/linux/lantiq/dts/P2812HNUF3.dts
index a293f59..dabf5ed 100644
--- a/target/linux/lantiq/dts/P2812HNUF3.dts
+++ b/target/linux/lantiq/dts/P2812HNUF3.dts
@@ -14,18 +14,24 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x50000>;
-					read-only;
-				};
-				partition@50000 {
-					label = "uboot-env";
-					reg = <0x50000 0x10000>;
-				};
-				partition@60000 {
-					label = "unused";
-					reg = <0x60000 0x7a0000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x0 0x50000>;
+						read-only;
+					};
+					partition@50000 {
+						label = "uboot-env";
+						reg = <0x50000 0x10000>;
+					};
+					partition@60000 {
+						label = "unused";
+						reg = <0x60000 0x7a0000>;
+					};
 				};
 			};
 
diff --git a/target/linux/lantiq/dts/TDW89X0.dtsi b/target/linux/lantiq/dts/TDW89X0.dtsi
index 312a2d6..634b296 100644
--- a/target/linux/lantiq/dts/TDW89X0.dtsi
+++ b/target/linux/lantiq/dts/TDW89X0.dtsi
@@ -158,27 +158,33 @@
 		spi-max-frequency = <33250000>;
 		m25p,fast-read;
 
-		partition@0 {
-			reg = <0x0 0x20000>;
-			label = "u-boot";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x0 0x20000>;
+				label = "u-boot";
+				read-only;
+			};
 
-		partition@20000 {
-			reg = <0x20000 0x7a0000>;
-			label = "firmware";
-		};
+			partition@20000 {
+				reg = <0x20000 0x7a0000>;
+				label = "firmware";
+			};
 
-		partition@7c0000 {
-			reg = <0x7c0000 0x10000>;
-			label = "config";
-			read-only;
-		};
+			partition@7c0000 {
+				reg = <0x7c0000 0x10000>;
+				label = "config";
+				read-only;
+			};
 
-		ath9k_cal: partition@7d0000 {
-			reg = <0x7d0000 0x30000>;
-			label = "boardconfig";
-			read-only;
+			ath9k_cal: partition@7d0000 {
+				reg = <0x7d0000 0x30000>;
+				label = "boardconfig";
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/VG3503J.dtsi b/target/linux/lantiq/dts/VG3503J.dtsi
index 62a336c..f68d22c 100644
--- a/target/linux/lantiq/dts/VG3503J.dtsi
+++ b/target/linux/lantiq/dts/VG3503J.dtsi
@@ -29,44 +29,50 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x20000>;
-				};
-
-				partition@20000 {
-					label = "kernel";
-					reg = <0x20000 0x300000>;
-				};
-
-				partition@1a0000 {
-					label = "rootfs";
-					reg = <0x320000 0x420000>;
-				};
-
-				partition@740000 {
-					label = "btagent";
-					reg = <0x740000 0x80000>;
-				};
-
-				partition@7c0000 {
-					label = "pri_bfocus_cfg";
-					reg = <0x7c0000 0x10000>;
-				};
-
-				partition@7d0000 {
-					label = "sec_bfocus_cfg";
-					reg = <0x7d0000 0x10000>;
-				};
-
-				partition@7e0000 {
-					label = "sysconfig";
-					reg = <0x7e0000 0x10000>;
-				};
-
-				partition@7f0000 {
-					label = "misc_cfg";
-					reg = <0x7f0000 0x10000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x20000>;
+					};
+
+					partition@20000 {
+						label = "kernel";
+						reg = <0x20000 0x300000>;
+					};
+
+					partition@1a0000 {
+						label = "rootfs";
+						reg = <0x320000 0x420000>;
+					};
+
+					partition@740000 {
+						label = "btagent";
+						reg = <0x740000 0x80000>;
+					};
+
+					partition@7c0000 {
+						label = "pri_bfocus_cfg";
+						reg = <0x7c0000 0x10000>;
+					};
+
+					partition@7d0000 {
+						label = "sec_bfocus_cfg";
+						reg = <0x7d0000 0x10000>;
+					};
+
+					partition@7e0000 {
+						label = "sysconfig";
+						reg = <0x7e0000 0x10000>;
+					};
+
+					partition@7f0000 {
+						label = "misc_cfg";
+						reg = <0x7f0000 0x10000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi
index e504dc2..c9045fa 100644
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -30,10 +30,16 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				boardconfig: partition@fe0000 {
-					label = "board_config";
-					reg = <0xfe0000 0x20000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					boardconfig: partition@fe0000 {
+						label = "board_config";
+						reg = <0xfe0000 0x20000>;
+						read-only;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/VGV7510KW22BRN.dts b/target/linux/lantiq/dts/VGV7510KW22BRN.dts
index 1880c8c..8ce715b 100644
--- a/target/linux/lantiq/dts/VGV7510KW22BRN.dts
+++ b/target/linux/lantiq/dts/VGV7510KW22BRN.dts
@@ -6,46 +6,48 @@
 	fpi@10000000 {
 		localbus@0 {
 			nor-boot@0 {
-				partition@0 {
-					label = "Boot";
-					reg = <0x00000 0x40000>;
-					read-only;
-				};
-
-				partition@40000 {
-					label = "Configuration";
-					reg = <0x40000 0x40000>;
-					read-only;
-				};
-
-				partition@80000 {
-					label = "Certificate";
-					reg = <0x80000 0x20000>;
-					read-only;
-				};
-
-				partition@a0000 {
-					label = "Special_Area";
-					reg = <0xa0000 0x20000>;
-					read-only;
-				};
-
-				partition@c0000 {
-					label = "Primary_Setting";
-					reg = <0xc0000 0x20000>;
-					read-only;
-				};
-
-				partition@e0000 {
-					label = "firmware"; /* "Code Image 0" in OFW */
-					reg = <0xe0000 0x780000>;
-					read-only;
-				};
-
-				partition@860000 {
-					label = "Code_Image_1";
-					reg = <0x860000 0x780000>;
-					read-only;
+				partitions {
+					partition@0 {
+						label = "Boot";
+						reg = <0x00000 0x40000>;
+						read-only;
+					};
+
+					partition@40000 {
+						label = "Configuration";
+						reg = <0x40000 0x40000>;
+						read-only;
+					};
+
+					partition@80000 {
+						label = "Certificate";
+						reg = <0x80000 0x20000>;
+						read-only;
+					};
+
+					partition@a0000 {
+						label = "Special_Area";
+						reg = <0xa0000 0x20000>;
+						read-only;
+					};
+
+					partition@c0000 {
+						label = "Primary_Setting";
+						reg = <0xc0000 0x20000>;
+						read-only;
+					};
+
+					partition@e0000 {
+						label = "firmware"; /* "Code Image 0" in OFW */
+						reg = <0xe0000 0x780000>;
+						read-only;
+					};
+
+					partition@860000 {
+						label = "Code_Image_1";
+						reg = <0x860000 0x780000>;
+						read-only;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/VGV7510KW22NOR.dts b/target/linux/lantiq/dts/VGV7510KW22NOR.dts
index e2fcd1b..f68cf5b 100644
--- a/target/linux/lantiq/dts/VGV7510KW22NOR.dts
+++ b/target/linux/lantiq/dts/VGV7510KW22NOR.dts
@@ -6,21 +6,23 @@
 	fpi@10000000 {
 		localbus@0 {
 			nor-boot@0 {
-				partition@0 {
-					label = "uboot";
-					reg = <0x0 0x60000>; /* 384 KiB */
-					read-only;
-				};
+				partitions {
+					partition@0 {
+						label = "uboot";
+						reg = <0x0 0x60000>; /* 384 KiB */
+						read-only;
+					};
 
-				partition@60000 {
-					label = "uboot-env";
-					reg = <0x60000 0x20000>; /* 128 KiB */
-					read-only;
-				};
+					partition@60000 {
+						label = "uboot-env";
+						reg = <0x60000 0x20000>; /* 128 KiB */
+						read-only;
+					};
 
-				partition@80000 {
-					label = "firmware";
-					reg = <0x80000 0xf60000>; /* 15744 KiB */
+					partition@80000 {
+						label = "firmware";
+						reg = <0x80000 0xf60000>; /* 15744 KiB */
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/VGV7519BRN.dts b/target/linux/lantiq/dts/VGV7519BRN.dts
index c90b680..4f56ba8 100644
--- a/target/linux/lantiq/dts/VGV7519BRN.dts
+++ b/target/linux/lantiq/dts/VGV7519BRN.dts
@@ -13,19 +13,25 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@40000 {
-					label = "board_config";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
-				partition@80000 {
-					label = "firmware";
-					reg = <0x80000 0x780000>;
-					read-only;
-				};
-				partition@880000 {
-					label = "rootfs_data";
-					reg = <0x880000 0x780000>;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@40000 {
+						label = "board_config";
+						reg = <0x40000 0x10000>;
+						read-only;
+					};
+					partition@80000 {
+						label = "firmware";
+						reg = <0x80000 0x780000>;
+						read-only;
+					};
+					partition@880000 {
+						label = "rootfs_data";
+						reg = <0x880000 0x780000>;
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/VGV7519NOR.dts b/target/linux/lantiq/dts/VGV7519NOR.dts
index 355a90c..24a3d16 100644
--- a/target/linux/lantiq/dts/VGV7519NOR.dts
+++ b/target/linux/lantiq/dts/VGV7519NOR.dts
@@ -13,25 +13,31 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-				};
-				partition@40000 {
-					label = "board_config";
-					reg = <0x40000 0x10000>;
-					read-only;
-				};
-				partition@60000 {
-					label = "uboot_env";
-					reg = <0x60000 0x10000>;
-				};
-				partition@80000 {
-					label = "firmware";
-					reg = <0x80000 0xf80000>;
-					// 0x080000 - 0x01b0000 : kernel
-					// 0x1b0000 - 0x1000000 : rootfs (squashfs)
-					// 0x390000 - 0x1000000 : rootfs_data
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+					};
+					partition@40000 {
+						label = "board_config";
+						reg = <0x40000 0x10000>;
+						read-only;
+					};
+					partition@60000 {
+						label = "uboot_env";
+						reg = <0x60000 0x10000>;
+					};
+					partition@80000 {
+						label = "firmware";
+						reg = <0x80000 0xf80000>;
+						// 0x080000 - 0x01b0000 : kernel
+						// 0x1b0000 - 0x1000000 : rootfs (squashfs)
+						// 0x390000 - 0x1000000 : rootfs_data
+					};
 				};
 			};
 		};
diff --git a/target/linux/lantiq/dts/VR200v.dts b/target/linux/lantiq/dts/VR200v.dts
index fb01d7f..e281042 100644
--- a/target/linux/lantiq/dts/VR200v.dts
+++ b/target/linux/lantiq/dts/VR200v.dts
@@ -166,45 +166,51 @@
 		spi-max-frequency = <33250000>;
 		m25p,fast-read;
 
-		partition@0 {
-			reg = <0x0 0x20000>;
-			label = "u-boot";
-			read-only;
-		};
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
 
-		partition@20000 {
-			reg = <0x20000 0xf90000>;
-			label = "firmware";
-		};
+			partition@0 {
+				reg = <0x0 0x20000>;
+				label = "u-boot";
+				read-only;
+			};
 
-		partition@fb0000 {
-			reg = <0xfb0000 0x10000>;
-			label = "radioDECT";
-			read-only;
-		};
+			partition@20000 {
+				reg = <0x20000 0xf90000>;
+				label = "firmware";
+			};
 
-		partition@fc0000 {
-			reg = <0xfc0000 0x10000>;
-			label = "config";
-			read-only;
-		};
+			partition@fb0000 {
+				reg = <0xfb0000 0x10000>;
+				label = "radioDECT";
+				read-only;
+			};
 
-		romfile: partition@fd0000 {
-			reg = <0xfd0000 0x10000>;
-			label = "romfile";
-			read-only;
-		};
+			partition@fc0000 {
+				reg = <0xfc0000 0x10000>;
+				label = "config";
+				read-only;
+			};
 
-		partition@fe0000 {
-			reg = <0xfe0000 0x10000>;
-			label = "rom";
-			read-only;
-		};
+			romfile: partition@fd0000 {
+				reg = <0xfd0000 0x10000>;
+				label = "romfile";
+				read-only;
+			};
 
-		partition@ff0000 {
-			reg = <0xff0000 0x10000>;
-			label = "radio";
-			read-only;
+			partition@fe0000 {
+				reg = <0xfe0000 0x10000>;
+				label = "rom";
+				read-only;
+			};
+
+			partition@ff0000 {
+				reg = <0xff0000 0x10000>;
+				label = "radio";
+				read-only;
+			};
 		};
 	};
 };
diff --git a/target/linux/lantiq/dts/WBMR.dts b/target/linux/lantiq/dts/WBMR.dts
index 4a20850..5b4740c 100644
--- a/target/linux/lantiq/dts/WBMR.dts
+++ b/target/linux/lantiq/dts/WBMR.dts
@@ -33,33 +33,39 @@
 				#address-cells = <1>;
 				#size-cells = <1>;
 
-				partition@0 {
-					label = "uboot";
-					reg = <0x00000 0x40000>;
-					read-only;
-				};
-
-				partition@40000 {
-					label = "uboot_env";
-					reg = <0x40000 0x20000>;
-					read-only;
-				};
-
-				partition@20000 {
-					label = "firmware";
-					reg = <0x60000 0x1f20000>;
-				};
-
-				partition@0x1fc0000 {
-					label = "board";
-					reg = <0x1fc0000 0x20000>;
-					read-only;
-				};
-
-				partition@0x1fe0000 {
-					label = "calibration";
-					reg = <0x1fe0000 0x20000>;
-					read-only;
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "uboot";
+						reg = <0x00000 0x40000>;
+						read-only;
+					};
+
+					partition@40000 {
+						label = "uboot_env";
+						reg = <0x40000 0x20000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "firmware";
+						reg = <0x60000 0x1f20000>;
+					};
+
+					partition@0x1fc0000 {
+						label = "board";
+						reg = <0x1fc0000 0x20000>;
+						read-only;
+					};
+
+					partition@0x1fe0000 {
+						label = "calibration";
+						reg = <0x1fe0000 0x20000>;
+						read-only;
+					};
 				};
 			};