Merge tag 'mvebu-dt-4.5-1' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu dt for 4.5 (part 1)" from Gregory CLEMENT:

Update partition handling for ix4-300d

* tag 'mvebu-dt-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: dt: mvebu: ix4-300d: Cleanup NAND partition ranges
  ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node
  ARM: dt: mvebu: ix4-300d: remove whole flash partition

arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

@@ -151,42 +151,42 @@ nand@d0000 {
 				marvell,nand-enable-arbiter;
 				nand-on-flash-bbt;
 
+				partitions {
+					#address-cells = <1>;
+					#size-cells = <1>;
+
 					partition@0 {
 						label = "u-boot";
-					reg = <0x0000000 0xe0000>;
+						reg = <0x00000000 0x000e0000>;
 						read-only;
 					};
 
 					partition@e0000 {
 						label = "u-boot-env";
-					reg = <0xe0000 0x20000>;
+						reg = <0x000e0000 0x00020000>;
 						read-only;
 					};
 
 					partition@100000 {
 						label = "u-boot-env2";
-					reg = <0x100000 0x20000>;
+						reg = <0x00100000 0x00020000>;
 						read-only;
 					};
 
 					partition@120000 {
 						label = "zImage";
-					reg = <0x120000 0x400000>;
+						reg = <0x00120000 0x00400000>;
 					};
 
 					partition@520000 {
 						label = "initrd";
-					reg = <0x520000 0x400000>;
+						reg = <0x00520000 0x00400000>;
 					};
 
-				partition@xE00000 {
+					partition@e00000 {
 						label = "boot";
-					reg = <0xE00000 0x3F200000>;
+						reg = <0x00e00000 0x3f200000>;
 					};
-
-				partition@flash {
-					label = "flash";
-					reg = <0x0 0x40000000>;
 				};
 			};
 		};