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, 31 insertions, 31 deletions

diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 30842b4ff293..320da677b984 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -90,37 +90,6 @@
                         pinctrl-names = "default";
                 };
 
-                nand@3000000 {
-                        status = "okay";
-                        pinctrl-0 = <&pmx_nand>;
-                        pinctrl-names = "default";
-
-                        partition@0 {
-                                label = "u-boot";
-                                reg = <0x0000000 0x180000>;
-                        };
-
-                        partition@180000 {
-                                label = "u-boot env";
-                                reg = <0x0180000 0x20000>;
-                        };
-
-                        partition@200000 {
-                                label = "uImage";
-                                reg = <0x0200000 0x600000>;
-                        };
-
-                        partition@800000 {
-                                label = "uInitrd";
-                                reg = <0x0800000 0x1000000>;
-                        };
-
-                        partition@1800000 {
-                                label = "rootfs";
-                                reg = <0x1800000 0xe800000>;
-                        };
-                };
-
                 sata@80000 {
                         status = "okay";
                         nr-ports = <1>;
@@ -204,6 +173,37 @@
         };
 };
 
+&nand {
+        status = "okay";
+        pinctrl-0 = <&pmx_nand>;
+        pinctrl-names = "default";
+
+        partition@0 {
+                label = "u-boot";
+                reg = <0x0000000 0x180000>;
+        };
+
+        partition@180000 {
+                label = "u-boot env";
+                reg = <0x0180000 0x20000>;
+        };
+
+        partition@200000 {
+                label = "uImage";
+                reg = <0x0200000 0x600000>;
+        };
+
+        partition@800000 {
+                label = "uInitrd";
+                reg = <0x0800000 0x1000000>;
+        };
+
+        partition@1800000 {
+                label = "rootfs";
+                reg = <0x1800000 0xe800000>;
+        };
+};
+
 &mdio {
         status = "okay";