1 files changed, 44 insertions, 41 deletions

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 bbbb38888bb8..87dcb502f72d 100644
--- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@ -81,49 +81,52 @@
 
                         };
 
-                        nand@d0000 {
+                        nand-controller@d0000 {
                                 status = "okay";
-                                label = "pxa3xx_nand-0";
-                                num-cs = <1>;
-                                marvell,nand-keep-config;
-                                nand-on-flash-bbt;
-
-                                partitions {
-                                        compatible = "fixed-partitions";
-                                        #address-cells = <1>;
-                                        #size-cells = <1>;
-
-                                        partition@0 {
-                                                label = "u-boot";
-                                                reg = <0x00000000 0x000e0000>;
-                                                read-only;
-                                        };
-
-                                        partition@e0000 {
-                                                label = "u-boot-env";
-                                                reg = <0x000e0000 0x00020000>;
-                                                read-only;
-                                        };
-
-                                        partition@100000 {
-                                                label = "u-boot-env2";
-                                                reg = <0x00100000 0x00020000>;
-                                                read-only;
-                                        };
-
-                                        partition@120000 {
-                                                label = "zImage";
-                                                reg = <0x00120000 0x00400000>;
-                                        };
-
-                                        partition@520000 {
-                                                label = "initrd";
-                                                reg = <0x00520000 0x00400000>;
-                                        };
 
-                                        partition@e00000 {
-                                                label = "boot";
-                                                reg = <0x00e00000 0x3f200000>;
+                                nand@0 {
+                                        reg = <0>;
+                                        label = "pxa3xx_nand-0";
+                                        nand-rb = <0>;
+                                        nand-on-flash-bbt;
+
+                                        partitions {
+                                                compatible = "fixed-partitions";
+                                                #address-cells = <1>;
+                                                #size-cells = <1>;
+
+                                                partition@0 {
+                                                        label = "u-boot";
+                                                        reg = <0x00000000 0x000e0000>;
+                                                        read-only;
+                                                };
+
+                                                partition@e0000 {
+                                                        label = "u-boot-env";
+                                                        reg = <0x000e0000 0x00020000>;
+                                                        read-only;
+                                                };
+
+                                                partition@100000 {
+                                                        label = "u-boot-env2";
+                                                        reg = <0x00100000 0x00020000>;
+                                                        read-only;
+                                                };
+
+                                                partition@120000 {
+                                                        label = "zImage";
+                                                        reg = <0x00120000 0x00400000>;
+                                                };
+
+                                                partition@520000 {
+                                                        label = "initrd";
+                                                        reg = <0x00520000 0x00400000>;
+                                                };
+
+                                                partition@e00000 {
+                                                        label = "boot";
+                                                        reg = <0x00e00000 0x3f200000>;
+                                                };
                                         };
                                 };
                         };