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,6 +96,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -105,12 +110,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

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

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

target/linux/brcm63xx/dts/a226m.dts

@@ -96,6 +96,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -105,12 +110,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/a4001n.dts

@@ -69,11 +69,13 @@
 		spi-rx-bus-width = <2>;
 		reg = <0>;
 
+		linux,part-probe = "bcm63xxpart";
+
+		partitions {
+			compatible = "fixed-partitions";
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-		linux,part-probe = "bcm63xxpart";
-
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -83,6 +85,7 @@
 			linux@10000 {
 				reg = <0x010000 0x7e0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@7f0000 {
@@ -90,6 +93,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/a4001n1.dts

@@ -102,6 +102,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -111,6 +116,7 @@
 			linux@10000 {
 				reg = <0x010000 0xfe0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@ff0000 {
@@ -118,6 +124,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

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,6 +100,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -109,12 +114,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@fe0000 {
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -82,6 +82,12 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -91,6 +97,7 @@
 			linux@10000 {
 				reg = <0x010000 0xfe0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@ff0000 {
@@ -98,6 +105,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &pinctrl {

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

@@ -61,6 +61,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -70,6 +75,7 @@
 			linux@10000 {
 				reg = <0x010000 0xfe0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@ff0000 {
@@ -77,6 +83,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

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

@@ -69,6 +69,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -78,6 +83,7 @@
 			linux@10000 {
 				reg = <0x010000 0xfe0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@ff0000 {
@@ -85,6 +91,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/ar1004g.dts

@@ -51,6 +51,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -60,12 +65,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/av4202n.dts

@@ -73,6 +73,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -82,12 +87,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@fe0000 {
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

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,6 +47,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -56,12 +61,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/cpva642.dts

@@ -84,6 +84,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -93,12 +98,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -61,6 +61,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -70,12 +75,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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

@@ -82,6 +82,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -91,12 +96,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/ct536plus.dts

@@ -47,6 +47,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -56,12 +61,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/cvg834g.dts

@@ -29,6 +29,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -38,12 +43,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/dg834g_v4.dts

@@ -55,6 +55,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -64,12 +69,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/dg834gtpn.dts

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -68,12 +73,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/dgnd3700v1.dts

@@ -93,6 +93,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -102,6 +107,7 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0x1e20000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		board_data@1e40000 {
@@ -114,6 +120,7 @@
 			label = "nvram";
 			reg = <0x1fe0000 0x20000>;
 		};
+	};
 }; 
 
 &pinctrl {

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

@@ -55,6 +55,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -64,12 +69,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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

@@ -39,6 +39,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -48,12 +53,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -41,6 +41,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -50,12 +55,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -68,12 +73,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -83,6 +83,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -92,6 +97,7 @@
 			linux@10000 {
 				reg = <0x010000 0x7c0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			cal_data@7d0000 {
@@ -105,6 +111,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

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

@@ -96,6 +96,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -105,6 +110,7 @@
 			linux@10000 {
 				reg = <0x010000 0x7e0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@7f0000 {
@@ -112,6 +118,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &pinctrl {

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

@@ -19,6 +19,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		backup@0 {
 			label = "backup";
 			reg = <0x000000 0x400000>;
@@ -33,6 +38,8 @@
 		linux@410000 {
 			label = "linux";
 			reg = <0x410000 0x3f0000>;
+			compatible = "brcm,bcm963xx-imagetag";
+		};
 	};
 };
 

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

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -68,12 +73,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/evg2000.dts

@@ -84,6 +84,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x00000000 0x00020000>;
@@ -93,6 +98,7 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x00020000 0x00f40000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		board_data@f60000 {
@@ -105,6 +111,7 @@
 			label = "nvram";
 			reg = <0x00fe0000 0x00020000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/f5d7633.dts

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -68,12 +73,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0x3c0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3e0000 {
 			label = "nvram";
 			reg = <0x3e0000 0x020000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/fast2404.dts

@@ -19,6 +19,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -28,12 +33,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/fast2504n.dts

@@ -78,6 +78,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -87,6 +92,7 @@
 			linux@10000 {
 				reg = <0x010000 0x7e0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@7f0000 {
@@ -94,6 +100,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/fast2604.dts

@@ -55,6 +55,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -64,12 +69,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/fast2704n.dts

@@ -103,6 +103,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -112,6 +117,7 @@
 			linux@10000 {
 				reg = <0x010000 0x7e0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@7f0000 {
@@ -119,6 +125,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/fast2704v2.dts

@@ -87,6 +87,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -96,6 +101,7 @@
 			linux@10000 {
 				reg = <0x010000 0x7e0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@7f0000 {
@@ -103,6 +109,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/gw6000.dts

@@ -33,6 +33,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -42,12 +47,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/gw6200.dts

@@ -54,6 +54,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -63,12 +68,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/hg520v.dts

@@ -42,6 +42,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+		partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -51,12 +56,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/hg553.dts

@@ -81,6 +81,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -90,12 +95,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@fe0000 {
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -107,6 +107,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -116,6 +121,7 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xec0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		cal_data@ee0000 {
@@ -128,6 +134,7 @@
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -107,6 +107,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -116,6 +121,7 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xec0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		cal_data@ee0000 {
@@ -128,6 +134,7 @@
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -102,6 +102,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -111,6 +116,7 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xec0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		cal_data@ee0000 {
@@ -123,6 +129,7 @@
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/hg622.dts

@@ -56,6 +56,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -65,6 +70,7 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xf80000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		cal_data@fa0000 {
@@ -77,6 +83,7 @@
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/hg655b.dts

@@ -74,6 +74,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -87,6 +92,7 @@
 		board_data@790000 {
 			label = "board_data";
 			reg = <0x790000 0x030000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		cal_data@7c0000 {
@@ -99,6 +105,7 @@
 			label = "nvram";
 			reg = <0x7e0000 0x020000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/homehub2a.dts

@@ -141,6 +141,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -149,12 +154,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@fe0000 {
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/magic.dts

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -68,12 +73,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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,6 +66,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -75,6 +80,7 @@
 			linux@10000 {
 				reg = <0x010000 0xfe0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@ff0000 {
@@ -82,6 +88,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

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

@@ -64,6 +64,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -73,12 +78,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/r1000h.dts

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

target/linux/brcm63xx/dts/r5010unv2.dts

@@ -83,6 +83,11 @@
 
 		linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 			cfe@0 {
 				reg = <0x000000 0x010000>;
 				label = "cfe";
@@ -92,6 +97,7 @@
 			linux@10000 {
 				reg = <0x010000 0x7e0000>;
 				label = "linux";
+				compatible = "brcm,bcm963xx-imagetag";
 			};
 
 			nvram@7f0000 {
@@ -99,6 +105,7 @@
 				label = "nvram";
 			};
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/rg100a.dts

@@ -41,6 +41,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -50,12 +55,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0xfc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@fe0000 {
 			label = "nvram";
 			reg = <0xfe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/rta1025w.dts

@@ -19,6 +19,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -28,12 +33,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/rta1320.dts

@@ -41,6 +41,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -50,12 +55,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/rta770bw.dts

@@ -57,6 +57,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -66,12 +71,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/rta770w.dts

@@ -57,6 +57,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -66,12 +71,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/spw303v.dts

@@ -68,6 +68,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -77,12 +82,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &uart0 {

target/linux/brcm63xx/dts/spw500v.dts

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -68,12 +73,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x020000>;
@@ -68,12 +73,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x020000 0x3d0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3e0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/usr9108.dts

@@ -32,6 +32,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -41,12 +46,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

target/linux/brcm63xx/dts/v2110.dts

@@ -58,6 +58,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -67,12 +72,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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

@@ -58,6 +58,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -67,12 +72,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x3e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@3f0000 {
 			label = "nvram";
 			reg = <0x3f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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,6 +85,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x0000000 0x0020000>;
@@ -94,12 +99,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x0020000 0x1fc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@1fe0000 {
 			label = "nvram";
 			reg = <0x1fe0000 0x020000>;
 		};
+	};
 };
 
 &uart0 {

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

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x0000000 0x0020000>;
@@ -68,12 +73,14 @@
 		linux@20000 {
 			label = "linux";
 			reg = <0x0020000 0x1fc0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@1fe0000 {
 			label = "nvram";
 			reg = <0x1fe0000 0x020000>;
 		};
+	};
 };
 
 &pinctrl {

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

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -68,12 +73,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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

@@ -59,6 +59,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -68,12 +73,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &pinctrl {

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

@@ -69,6 +69,11 @@
 
 	linux,part-probe = "bcm63xxpart";
 
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
 		cfe@0 {
 			label = "CFE";
 			reg = <0x000000 0x010000>;
@@ -78,12 +83,14 @@
 		linux@10000 {
 			label = "linux";
 			reg = <0x010000 0x7e0000>;
+			compatible = "brcm,bcm963xx-imagetag";
 		};
 
 		nvram@7f0000 {
 			label = "nvram";
 			reg = <0x7f0000 0x010000>;
 		};
+	};
 };
 
 &lsspi {