ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node

NAND flash partitions should be part of a partitions sub-node
not the flash node itself. Move the partitions which will also
allow different bootloaders get rid of the stock partitions
easily by removing the partitions node.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index 30a0a6eac64564aa8da83be4b0c8bfb87e15cc72..76781fd18624701715d4dbc94df3ded6fa2525c3 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -151,37 +151,42 @@
                                marvell,nand-enable-arbiter;
                                nand-on-flash-bbt;
 
-                               partition@0 {
-                                       label = "u-boot";
-                                       reg = <0x0000000 0xe0000>;
-                                       read-only;
-                               };
-
-                               partition@e0000 {
-                                       label = "u-boot-env";
-                                       reg = <0xe0000 0x20000>;
-                                       read-only;
-                               };
-
-                               partition@100000 {
-                                       label = "u-boot-env2";
-                                       reg = <0x100000 0x20000>;
-                                       read-only;
-                               };
-
-                               partition@120000 {
-                                       label = "zImage";
-                                       reg = <0x120000 0x400000>;
-                               };
-
-                               partition@520000 {
-                                       label = "initrd";
-                                       reg = <0x520000 0x400000>;
-                               };
-
-                               partition@xE00000 {
-                                       label = "boot";
-                                       reg = <0xE00000 0x3F200000>;
+                               partitions {
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       partition@0 {
+                                               label = "u-boot";
+                                               reg = <0x0000000 0xe0000>;
+                                               read-only;
+                                       };
+
+                                       partition@e0000 {
+                                               label = "u-boot-env";
+                                               reg = <0xe0000 0x20000>;
+                                               read-only;
+                                       };
+
+                                       partition@100000 {
+                                               label = "u-boot-env2";
+                                               reg = <0x100000 0x20000>;
+                                               read-only;
+                                       };
+
+                                       partition@120000 {
+                                               label = "zImage";
+                                               reg = <0x120000 0x400000>;
+                                       };
+
+                                       partition@520000 {
+                                               label = "initrd";
+                                               reg = <0x520000 0x400000>;
+                                       };
+
+                                       partition@xE00000 {
+                                               label = "boot";
+                                               reg = <0xE00000 0x3F200000>;
+                                       };
                                };
                        };
                };