brcm63xx: switch to new partition layout specification

Now that we support parsing the expected upstream definition, update
the dts files to it.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

target/linux/brcm63xx/dts/a226g.dts

@@ -96,20 +96,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/a226m-fwb.dts

@@ -96,20 +96,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xfc0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@fe0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0xfe0000 0x020000>;
+			reg = <0x010000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/a226m.dts

@@ -96,20 +96,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/a4001n.dts

@@ -69,25 +69,29 @@
 		spi-rx-bus-width = <2>;
 		reg = <0>;
 
-		#address-cells = <1>;
-		#size-cells = <1>;
-
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0x7e0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@7f0000 {
+			linux@10000 {
-			reg = <0x7f0000 0x010000>;
+				reg = <0x010000 0x7e0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@7f0000 {
+				reg = <0x7f0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/a4001n1.dts

@@ -102,20 +102,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0xfe0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@ff0000 {
+			linux@10000 {
-			reg = <0xff0000 0x010000>;
+				reg = <0x010000 0xfe0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@ff0000 {
+				reg = <0xff0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/ad1018-nor.dts

@@ -133,6 +133,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/agpf-s0.dts

@@ -100,20 +100,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xfc0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@fe0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0xfe0000 0x020000>;
+			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/ar-5315u.dts

@@ -82,20 +82,28 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
-			reg = <0x000000 0x010000>;
-			label = "cfe";
-			read-only;
-		};
 
-		linux@10000 {
+		partitions {
-			reg = <0x010000 0xfe0000>;
+			compatible = "fixed-partitions";
-			label = "linux";
+			#address-cells = <1>;
-		};
+			#size-cells = <1>;
 
-		nvram@ff0000 {
+			cfe@0 {
-			reg = <0xff0000 0x010000>;
+				reg = <0x000000 0x010000>;
-			label = "nvram";
+				label = "cfe";
+				read-only;
+			};
+
+			linux@10000 {
+				reg = <0x010000 0xfe0000>;
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@ff0000 {
+				reg = <0xff0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/ar-5381u.dts

@@ -61,20 +61,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0xfe0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@ff0000 {
+			linux@10000 {
-			reg = <0xff0000 0x010000>;
+				reg = <0x010000 0xfe0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@ff0000 {
+				reg = <0xff0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/ar-5387un.dts

@@ -69,20 +69,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0xfe0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@ff0000 {
+			linux@10000 {
-			reg = <0xff0000 0x010000>;
+				reg = <0x010000 0xfe0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@ff0000 {
+				reg = <0xff0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/ar1004g.dts

@@ -51,20 +51,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/av4202n.dts

@@ -73,20 +73,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xfc0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@fe0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0xfe0000 0x020000>;
+			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/bcm96318ref.dts

@@ -67,6 +67,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/bcm96318ref_p300.dts

@@ -73,6 +73,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/bcm963268bu_p300.dts

@@ -48,6 +48,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/bcm963269bhr.dts

@@ -56,6 +56,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/bcm963281TAN.dts

@@ -58,6 +58,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/bcm96328avng.dts

@@ -58,6 +58,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/bcm96338GW.dts

@@ -44,6 +44,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/bcm96338W.dts

@@ -44,6 +44,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/bcm96345GW2.dts

@@ -18,6 +18,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/bcm96348GW-10.dts

@@ -58,6 +58,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/bcm96348GW-11.dts

@@ -58,6 +58,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/bcm96348GW.dts

@@ -58,6 +58,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/bcm96348R.dts

@@ -44,6 +44,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/bcm96358VW.dts

@@ -44,6 +44,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/bcm96358VW2.dts

@@ -40,6 +40,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/bcm96368MVNgr.dts

@@ -44,6 +44,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/bcm96368MVWG.dts

@@ -44,6 +44,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/cpva502plus.dts

@@ -47,20 +47,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/cpva642.dts

@@ -84,20 +84,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/ct-5365.dts

@@ -61,20 +61,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/ct-6373.dts

@@ -82,20 +82,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/ct536plus.dts

@@ -47,20 +47,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/cvg834g.dts

@@ -29,20 +29,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dg834g_v4.dts

@@ -55,20 +55,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dg834gtpn.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dgnd3700v1.dts

@@ -93,26 +93,33 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0x1e20000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	board_data@1e40000 {
+		linux@20000 {
-		label = "board_data";
+			label = "linux";
-		reg = <0x1e40000 0x1a0000>;
+			reg = <0x020000 0x1e20000>;
-		read-only;
+			compatible = "brcm,bcm963xx-imagetag";
-	};
+		};
 
-	nvram@1fe0000 {
+		board_data@1e40000 {
-		label = "nvram";
+			label = "board_data";
-		reg = <0x1fe0000 0x20000>;
+			reg = <0x1e40000 0x1a0000>;
+			read-only;
+		};
+
+		nvram@1fe0000 {
+			label = "nvram";
+			reg = <0x1fe0000 0x20000>;
+		};
 	};
 }; 
 

target/linux/brcm63xx/dts/dsl-2640b-b.dts

@@ -55,20 +55,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dsl-2640u.dts

@@ -39,20 +39,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dsl-2650u.dts

@@ -41,20 +41,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dsl-274xb-c.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dsl-274xb-f.dts

@@ -83,26 +83,33 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0x7c0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		cal_data@7d0000 {
+			linux@10000 {
-			reg = <0x7d0000 0x010000>;
+				reg = <0x010000 0x7c0000>;
-			label = "cal_data";
+				label = "linux";
-			read-only;
+				compatible = "brcm,bcm963xx-imagetag";
-		};
+			};
 
-		nvram@7e0000 {
+			cal_data@7d0000 {
-			reg = <0x7e0000 0x020000>;
+				reg = <0x7d0000 0x010000>;
-			label = "nvram";
+				label = "cal_data";
+				read-only;
+			};
+
+			nvram@7e0000 {
+				reg = <0x7e0000 0x020000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/dsl-275xb-d.dts

@@ -96,20 +96,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0x7e0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@7f0000 {
+			linux@10000 {
-			reg = <0x7f0000 0x010000>;
+				reg = <0x010000 0x7e0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@7f0000 {
+				reg = <0x7f0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/dv-201amr.dts

@@ -19,20 +19,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	backup@0 {
+	partitions {
-		label = "backup";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x400000>;
+		#address-cells = <1>;
-	};
+		#size-cells = <1>;
 
-	cfe@400000 {
+		backup@0 {
-		label = "cfe";
+			label = "backup";
-		reg = <0x400000 0x010000>;
+			reg = <0x000000 0x400000>;
-		read-only;
+		};
-	};
 
-	linux@410000 {
+		cfe@400000 {
-		label = "linux";
+			label = "cfe";
-		reg = <0x410000 0x3f0000>;
+			reg = <0x400000 0x010000>;
+			read-only;
+		};
+
+		linux@410000 {
+			label = "linux";
+			reg = <0x410000 0x3f0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/dva-g3810bn_tl.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/evg2000.dts

@@ -84,26 +84,33 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x00000000 0x00020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x00020000 0x00f40000>;
+			reg = <0x00000000 0x00020000>;
-	};
+			read-only;
+		};
 
-	board_data@f60000 {
+		linux@20000 {
-		label = "board_data";
+			label = "linux";
-		reg = <0x00f60000 0x00080000>;
+			reg = <0x00020000 0x00f40000>;
-		read-only;
+			compatible = "brcm,bcm963xx-imagetag";
-	};
+		};
 
-	nvram@fe0000 {
+		board_data@f60000 {
-		label = "nvram";
+			label = "board_data";
-		reg = <0x00fe0000 0x00020000>;
+			reg = <0x00f60000 0x00080000>;
+			read-only;
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0x00fe0000 0x00020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/f5d7633.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0x3c0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@3e0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3e0000 0x020000>;
+			reg = <0x020000 0x3c0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3e0000 {
+			label = "nvram";
+			reg = <0x3e0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/fast2404.dts

@@ -19,20 +19,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/fast2504n.dts

@@ -78,20 +78,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0x7e0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@7f0000 {
+			linux@10000 {
-			reg = <0x7f0000 0x010000>;
+				reg = <0x010000 0x7e0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@7f0000 {
+				reg = <0x7f0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/fast2604.dts

@@ -55,20 +55,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/fast2704n.dts

@@ -103,20 +103,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0x7e0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@7f0000 {
+			linux@10000 {
-			reg = <0x7f0000 0x010000>;
+				reg = <0x010000 0x7e0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@7f0000 {
+				reg = <0x7f0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/fast2704v2.dts

@@ -87,20 +87,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0x7e0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@7f0000 {
+			linux@10000 {
-			reg = <0x7f0000 0x010000>;
+				reg = <0x010000 0x7e0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@7f0000 {
+				reg = <0x7f0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/gw6000.dts

@@ -33,20 +33,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/gw6200.dts

@@ -54,20 +54,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/hg520v.dts

@@ -42,20 +42,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+		partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/hg553.dts

@@ -81,20 +81,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xfc0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@fe0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0xfe0000 0x020000>;
+			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/hg556a-a.dts

@@ -107,26 +107,33 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xec0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	cal_data@ee0000 {
+		linux@20000 {
-		label = "cal_data";
+			label = "linux";
-		reg = <0xee0000 0x100000>;
+			reg = <0x020000 0xec0000>;
-		read-only;
+			compatible = "brcm,bcm963xx-imagetag";
-	};
+		};
 
-	nvram@fe0000 {
+		cal_data@ee0000 {
-		label = "nvram";
+			label = "cal_data";
-		reg = <0xfe0000 0x020000>;
+			reg = <0xee0000 0x100000>;
+			read-only;
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/hg556a-b.dts

@@ -107,26 +107,33 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xec0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	cal_data@ee0000 {
+		linux@20000 {
-		label = "cal_data";
+			label = "linux";
-		reg = <0xee0000 0x100000>;
+			reg = <0x020000 0xec0000>;
-		read-only;
+			compatible = "brcm,bcm963xx-imagetag";
-	};
+		};
 
-	nvram@fe0000 {
+		cal_data@ee0000 {
-		label = "nvram";
+			label = "cal_data";
-		reg = <0xfe0000 0x020000>;
+			reg = <0xee0000 0x100000>;
+			read-only;
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/hg556a-c.dts

@@ -102,26 +102,33 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xec0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	cal_data@ee0000 {
+		linux@20000 {
-		label = "cal_data";
+			label = "linux";
-		reg = <0xee0000 0x100000>;
+			reg = <0x020000 0xec0000>;
-		read-only;
+			compatible = "brcm,bcm963xx-imagetag";
-	};
+		};
 
-	nvram@fe0000 {
+		cal_data@ee0000 {
-		label = "nvram";
+			label = "cal_data";
-		reg = <0xfe0000 0x020000>;
+			reg = <0xee0000 0x100000>;
+			read-only;
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/hg622.dts

@@ -56,26 +56,33 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xf80000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	cal_data@fa0000 {
+		linux@20000 {
-		label = "cal_data";
+			label = "linux";
-		reg = <0xfa0000 0x020000>;
+			reg = <0x020000 0xf80000>;
-		read-only;
+			compatible = "brcm,bcm963xx-imagetag";
-	};
+		};
 
-	nvram@fe0000 {
+		cal_data@fa0000 {
-		label = "nvram";
+			label = "cal_data";
-		reg = <0xfe0000 0x020000>;
+			reg = <0xfa0000 0x020000>;
+			read-only;
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/hg655b.dts

@@ -74,30 +74,37 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-	};
+		#size-cells = <1>;
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0x770000>;
+			reg = <0x000000 0x020000>;
-	};
+		};
 
-	board_data@790000 {
+		linux@20000 {
-		label = "board_data";
+			label = "linux";
-		reg = <0x790000 0x030000>;
+			reg = <0x020000 0x770000>;
-	};
+		};
 
-	cal_data@7c0000 {
+		board_data@790000 {
-		label = "cal_data";
+			label = "board_data";
-		reg = <0x7c0000 0x020000>;
+			reg = <0x790000 0x030000>;
-		read-only;
+			compatible = "brcm,bcm963xx-imagetag";
-	};
+		};
 
-	nvram@7d0000 {
+		cal_data@7c0000 {
-		label = "nvram";
+			label = "cal_data";
-		reg = <0x7e0000 0x020000>;
+			reg = <0x7c0000 0x020000>;
+			read-only;
+		};
+
+		nvram@7d0000 {
+			label = "nvram";
+			reg = <0x7e0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/homehub2a.dts

@@ -141,19 +141,26 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-	};
+		#size-cells = <1>;
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xfc0000>;
+			reg = <0x000000 0x020000>;
-	};
+		};
 
-	nvram@fe0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0xfe0000 0x020000>;
+			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/magic.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/nb4-fxc-r1.dts

@@ -103,6 +103,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/nb4-ser-r0.dts

@@ -103,6 +103,10 @@
 	status = "ok";
 
 	linux,part-probe = "bcm63xxpart";
+
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/nb6-ser-r0.dts

@@ -66,20 +66,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+		partitions {
-			reg = <0x000000 0x010000>;
+			compatible = "fixed-partitions";
-			label = "cfe";
+			#address-cells = <1>;
-			read-only;
+			#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0xfe0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@ff0000 {
+			linux@10000 {
-			reg = <0xff0000 0x010000>;
+				reg = <0x010000 0xfe0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@ff0000 {
+				reg = <0xff0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/p870hw-51a-v2.dts

@@ -64,20 +64,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/r1000h.dts

@@ -79,17 +79,24 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	CFE@0 {
+	partitions {
-		reg = <0x000000 0x020000>;
+		compatible = "fixed-partitions";
-		read-only;
+		#address-cells = <1>;
-	};
+		#size-cells = <1>;
 
-	linux@20000 {
+		CFE@0 {
-		reg = <0x020000 0x1fc0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@1fe0000 {
+		linux@20000 {
-		reg = <0x1fe0000 0x20000>;
+			reg = <0x020000 0x1fc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@1fe0000 {
+			reg = <0x1fe0000 0x20000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/r5010unv2.dts

@@ -83,20 +83,27 @@
 
 		linux,part-probe = "bcm63xxpart";
 
-		cfe@0 {
+	partitions {
-			reg = <0x000000 0x010000>;
+		compatible = "fixed-partitions";
-			label = "cfe";
+		#address-cells = <1>;
-			read-only;
+		#size-cells = <1>;
-		};
 
-		linux@10000 {
+			cfe@0 {
-			reg = <0x010000 0x7e0000>;
+				reg = <0x000000 0x010000>;
-			label = "linux";
+				label = "cfe";
-		};
+				read-only;
+			};
 
-		nvram@7f0000 {
+			linux@10000 {
-			reg = <0x7f0000 0x010000>;
+				reg = <0x010000 0x7e0000>;
-			label = "nvram";
+				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
+			};
+
+			nvram@7f0000 {
+				reg = <0x7f0000 0x010000>;
+				label = "nvram";
+			};
 		};
 	};
 };

target/linux/brcm63xx/dts/rg100a.dts

@@ -41,20 +41,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0xfc0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@fe0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0xfe0000 0x020000>;
+			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@fe0000 {
+			label = "nvram";
+			reg = <0xfe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/rta1025w.dts

@@ -19,20 +19,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/rta1320.dts

@@ -41,20 +41,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/rta770bw.dts

@@ -57,20 +57,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/rta770w.dts

@@ -57,20 +57,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/spw303v.dts

@@ -68,20 +68,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/spw500v.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/td-w8900gb.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x020000 0x3d0000>;
+			reg = <0x000000 0x020000>;
-	};
+			read-only;
+		};
 
-	nvram@3e0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x020000 0x3d0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3e0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/usr9108.dts

@@ -32,20 +32,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/v2110.dts

@@ -58,20 +58,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/v2500v-bb.dts

@@ -58,20 +58,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x3e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@3f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x3f0000 0x010000>;
+			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@3f0000 {
+			label = "nvram";
+			reg = <0x3f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/vg50.dts

@@ -48,6 +48,10 @@
 		#size-cells = <1>;
 
 		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "brcm,bcm963xx-cfe-nor-partitions";
+		};
 	};
 };
 

target/linux/brcm63xx/dts/vh4032n.dts

@@ -85,20 +85,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x0000000 0x0020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x0020000 0x1fc0000>;
+			reg = <0x0000000 0x0020000>;
-	};
+			read-only;
+		};
 
-	nvram@1fe0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x1fe0000 0x020000>;
+			reg = <0x0020000 0x1fc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@1fe0000 {
+			label = "nvram";
+			reg = <0x1fe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/vr-3025u.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x0000000 0x0020000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@20000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x0020000 0x1fc0000>;
+			reg = <0x0000000 0x0020000>;
-	};
+			read-only;
+		};
 
-	nvram@1fe0000 {
+		linux@20000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x1fe0000 0x020000>;
+			reg = <0x0020000 0x1fc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@1fe0000 {
+			label = "nvram";
+			reg = <0x1fe0000 0x020000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/vr-3025un.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/vr-3026e.dts

@@ -59,20 +59,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };
 

target/linux/brcm63xx/dts/wap-5813n.dts

@@ -69,20 +69,27 @@
 
 	linux,part-probe = "bcm63xxpart";
 
-	cfe@0 {
+	partitions {
-		label = "CFE";
+		compatible = "fixed-partitions";
-		reg = <0x000000 0x010000>;
+		#address-cells = <1>;
-		read-only;
+		#size-cells = <1>;
-	};
 
-	linux@10000 {
+		cfe@0 {
-		label = "linux";
+			label = "CFE";
-		reg = <0x010000 0x7e0000>;
+			reg = <0x000000 0x010000>;
-	};
+			read-only;
+		};
 
-	nvram@7f0000 {
+		linux@10000 {
-		label = "nvram";
+			label = "linux";
-		reg = <0x7f0000 0x010000>;
+			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
+
+		nvram@7f0000 {
+			label = "nvram";
+			reg = <0x7f0000 0x010000>;
+		};
 	};
 };