diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts
index f7d7b4cf08c121..39c3f137da699f 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/br200-wp.dts
@@ -43,9 +43,7 @@
 		reg = <0 0xffe05000 0 0x1000>;
 		ranges = <0x0 0x0 0x0 0xec000000 0x4000000>;
 
-		nor@0,0 {
-			#address-cells = <1>;
-			#size-cells = <1>;
+		nor@0 {
 			compatible = "cfi-flash";
 			reg = <0x0 0x0 0x4000000>;
 			bank-width = <2>;
@@ -158,8 +156,6 @@
 
 			switch@10 {
 				compatible = "qca,qca8327";
-				#address-cells = <1>;
-				#size-cells = <0>;
 				reg = <0x10>;
 				reset-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
 
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
index 607706a2d434c2..89d8afe463a4a1 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/firebox-t10.dts
@@ -194,7 +194,7 @@
 			0x1 0x0 0x0 0xff800000 0x00010000
 			0x3 0x0 0x0 0xffb00000 0x00000020>;
 
-		nand@1,0 {
+		nand@100000000 {
 			compatible = "fsl,ifc-nand";
 			reg = <0x1 0x0 0x10000>;
 
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
index f74aca58c0d17f..6ad5c4ccd6d413 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/hiveap-330.dts
@@ -35,7 +35,7 @@
 		reg = <0 0xffe05000 0 0x1000>;
 		ranges = <0x0 0x0 0x0 0xec000000 0x4000000>;
 
-		nor@0,0 {
+		nor@0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "cfi-flash";
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts
index 9be822f7bb8acf..4b3b52d35b1290 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts
@@ -31,7 +31,7 @@
 			  0x2 0x0 0x0 0xffa00000 0x00020000
 			  0x3 0x0 0x0 0xffb00000 0x00020000>;
 
-		nand@1,0 {
+		nand@100000000 {
 			compatible = "fsl,p1020-fcm-nand", "fsl,elbc-fcm-nand";
 			reg = <0x1 0x0 0x40000>;
 
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts
index db35602b94b5b7..19bb8023ed5db9 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/red-15w-rev1.dts
@@ -122,7 +122,7 @@
 			0x1 0x0 0x0 0xff800000 0x00010000
 			0x3 0x0 0x0 0xffb00000 0x00000020>;
 
-		nand@1,0 {
+		nand@100000000 {
 			compatible = "fsl,ifc-nand";
 			reg = <0x1 0x0 0x10000>;
 
@@ -165,19 +165,23 @@
 					read-only;
 				};
 
-				partition@300000 {
-					reg = <0x300000 0x800000>;
-					label = "kernel";
-				};
-
-				partition@b00000 {
-					reg = <0xb00000 0x7500000>;
-					label = "ubi";
-				};
-
 				oem-partition@300000 {
 					reg = <0x300000 0x1900000>;
 					label = "sophos-os1";
+
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						reg = <0x0 0x800000>;
+						label = "kernel";
+					};
+
+					partition@800000 {
+						reg = <0x800000 0x7500000>;
+						label = "ubi";
+					};
 				};
 
 				oem-partition@1c00000 {
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
index ef46d8f14affee..5cf3c26fc93764 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
@@ -125,10 +125,8 @@
 				reg = <4>;
 			};
 
-			switch@0 {
+			switch@10 {
 				compatible = "qca,qca8327";
-				#address-cells = <1>;
-				#size-cells = <0>;
 				reg = <0x10>;
 
 				ports {
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts
index 5d81da46864139..72b8f7a9d6e9ac 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts
@@ -60,7 +60,7 @@
 		reg = <0 0xffe05000 0 0x1000>;
 		ranges = <0x0 0x0 0x0 0xee000000 0x2000000>;
 
-		nor@0,0 {
+		nor@0 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 			compatible = "cfi-flash";
diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts
index af8917ffe1ab4d..764c8a31c8ae18 100644
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3715i.dts
@@ -152,7 +152,7 @@
 				  0x1000000 0x0 0x0
 				  0x0 0x100000>;
 
-			wifi@0,0,0 {
+			wifi@0,0 {
 				compatible = "pci168c,0033";
 				reg = <0x0 0 0 0 0>;
 				ieee80211-freq-limit = <2400000 2500000>;
@@ -173,7 +173,7 @@
 				  0x1000000 0x0 0x0
 				  0x0 0x100000>;
 			
-			wifi@0,0,0 {
+			wifi@0,0 {
 				compatible = "pci168c,0033";
 				reg = <0x0 0 0 0 0>;
 				ieee80211-freq-limit = <5000000 6000000>;