1 files changed, 54 insertions, 31 deletions

diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index 2e567d90fba8..9047c168298a 100644
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -63,40 +63,63 @@
                         };
                 };
 
-                nand0: nand@40000000 {
-                        nand-bus-width = <8>;
-                        nand-ecc-mode = "soft";
-                        nand-on-flash-bbt = <1>;
+                ebi: ebi@10000000 {
+                        pinctrl-0 = <&pinctrl_ebi_addr_nand>;
+                        pinctrl-names = "default";
                         status = "okay";
 
-                        at91bootstrap@0 {
-                                label = "at91bootstrap";
-                                reg = <0x0 0x40000>;
-                        };
-
-                        bootloader@40000 {
-                                label = "bootloader";
-                                reg = <0x40000 0x80000>;
-                        };
-
-                        bootloaderenv@c0000 {
-                                label = "bootloader env";
-                                reg = <0xc0000 0xc0000>;
-                        };
-
-                        dtb@180000 {
-                                label = "device tree";
-                                reg = <0x180000 0x80000>;
-                        };
-
-                        kernel@200000 {
-                                label = "kernel";
-                                reg = <0x200000 0x600000>;
-                        };
+                        nand_controller: nand-controller {
+                                status = "okay";
+                                pinctrl-0 = <&pinctrl_nand_oe_we
+                                             &pinctrl_nand_cs
+                                             &pinctrl_nand_rb>;
+                                pinctrl-names = "default";
 
-                        rootfs@800000 {
-                                label = "rootfs";
-                                reg = <0x800000 0x0f800000>;
+                                nand@3 {
+                                        reg = <0x3 0x0 0x800000>;
+                                        rb-gpios = <&pioD 17 GPIO_ACTIVE_HIGH>;
+                                        cs-gpios = <&pioB 6 GPIO_ACTIVE_HIGH>;
+                                        nand-bus-width = <8>;
+                                        nand-ecc-mode = "soft";
+                                        nand-on-flash-bbt;
+                                        label = "atmel_nand";
+
+                                        partitions {
+                                                compatible = "fixed-partitions";
+                                                #address-cells = <1>;
+                                                #size-cells = <1>;
+
+                                                at91bootstrap@0 {
+                                                        label = "at91bootstrap";
+                                                        reg = <0x0 0x40000>;
+                                                };
+
+                                                bootloader@40000 {
+                                                        label = "bootloader";
+                                                        reg = <0x40000 0x80000>;
+                                                };
+
+                                                bootloaderenv@c0000 {
+                                                        label = "bootloader env";
+                                                        reg = <0xc0000 0xc0000>;
+                                                };
+
+                                                dtb@180000 {
+                                                        label = "device tree";
+                                                        reg = <0x180000 0x80000>;
+                                                };
+
+                                                kernel@200000 {
+                                                        label = "kernel";
+                                                        reg = <0x200000 0x600000>;
+                                                };
+
+                                                rootfs@800000 {
+                                                        label = "rootfs";
+                                                        reg = <0x800000 0x0f800000>;
+                                                };
+                                        };
+                                };
                         };
                 };