ARM: kirkwood: Move the nand node under the mbus node

There should be no nodes that are not children of the mbus. Move
the nand node under the mbus, and rework the board .dts files
to use an & reference to the nand node.

Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

1 files changed, 26 insertions, 25 deletions

diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index df8447442b37..d15395d671ed 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -113,31 +113,6 @@
                         status = "ok";
                 };
 
-                nand@3000000 {
-                        status = "okay";
-
-                        partition@0 {
-                                label = "u-boot";
-                                reg = <0x0000000 0x100000>;
-                                read-only;
-                        };
-
-                        partition@a0000 {
-                                label = "env";
-                                reg = <0xa0000 0x20000>;
-                                read-only;
-                        };
-
-                        partition@100000 {
-                                label = "uImage";
-                                reg = <0x100000 0x300000>;
-                        };
-
-                        partition@400000 {
-                                label = "uInitrd";
-                                reg = <0x540000 0x1000000>;
-                        };
-                };
                 sata@80000 {
                         status = "okay";
                         nr-ports = <2>;
@@ -195,6 +170,32 @@
         };
 };
 
+&nand {
+        status = "okay";
+
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x100000>;
+                read-only;
+        };
+
+        partition@a0000 {
+                label = "env";
+                reg = <0xa0000 0x20000>;
+                read-only;
+        };
+
+        partition@100000 {
+                label = "uImage";
+                reg = <0x100000 0x300000>;
+        };
+
+        partition@400000 {
+                label = "uInitrd";
+                reg = <0x540000 0x1000000>;
+        };
+};
+
 &mdio {
         status = "okay";