--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -194,16 +194,12 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 					partition@0 {
-						label = "kernel";
-						reg = <0x0 0x180000>;
+						label = "firmware";
+						reg = <0x0 0x3e00000>;
 					};
-					partition@180000 {
-						label = "root";
-						reg = <0x180000 0x200000>;
-					};
-					partition@380000 {
-						label = "user";
-						reg = <0x380000 0x3bc0000>;
+					partition@3e00000 {
+						label = "diagnostics";
+						reg = <0x3e00000 0x140000>;
 					};
 					partition@3f40000 {
 						label = "env";
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -222,24 +222,12 @@
 					#address-cells = <1>;
 					#size-cells = <1>;
 					partition@0 {
-						label = "kernel";
-						reg = <0x00000000 0x001e0000>;
-					};
-					partition@1e0000 {
-						label = "dtb";
-						reg = <0x001e0000 0x00020000>;
+						label = "kernel+dtb";
+						reg = <0x00000000 0x00200000>;
 					};
 					partition@200000 {
-						label = "ramdisk";
-						reg = <0x00200000 0x01400000>;
-					};
-					partition@1600000 {
-						label = "jffs2";
-						reg = <0x01600000 0x00400000>;
-					};
-					partition@1a00000 {
-						label = "user";
-						reg = <0x01a00000 0x02560000>;
+						label = "rootfs";
+						reg = <0x00200000 0x03d60000>;
 					};
 					partition@3f60000 {
 						label = "env";