Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-cosino.dtsi

diff --git a/arch/arm/boot/dts/at91-cosino.dtsi b/arch/arm/boot/dts/at91-cosino.dtsi
index 02d8ef43de3a63d44f81434a3fa6be62a1b80524..89cde175154ed49b71440d176d1639cd1c6ea243 100644 (file)
--- a/arch/arm/boot/dts/at91-cosino.dtsi
+++ b/arch/arm/boot/dts/at91-cosino.dtsi
@@ -82,38 +82,61 @@
                        };
                };
 
-               nand0: nand@40000000 {
-                       nand-bus-width = <8>;
-                       nand-ecc-mode = "hw";
-                       atmel,has-pmecc;        /* Enable PMECC */
-                       atmel,pmecc-cap = <4>;
-                       atmel,pmecc-sector-size = <512>;
-                       nand-on-flash-bbt;
+               ebi: ebi@10000000 {
+                       pinctrl-0 = <&pinctrl_ebi_addr_nand
+                                    &pinctrl_ebi_data_0_7>;
+                       pinctrl-names = "default";
                        status = "okay";
 
-                       at91bootstrap@0 {
-                               label = "at91bootstrap";
-                               reg = <0x0 0x40000>;
-                       };
-
-                       uboot@40000 {
-                               label = "u-boot";
-                               reg = <0x40000 0x80000>;
-                       };
-
-                       ubootenv@c0000 {
-                               label = "U-Boot Env";
-                               reg = <0xc0000 0x140000>;
-                       };
-
-                       kernel@200000 {
-                               label = "kernel";
-                               reg = <0x200000 0x600000>;
-                       };
-
-                       rootfs@800000 {
-                               label = "rootfs";
-                               reg = <0x800000 0x0f800000>;
+                       nand_controller: nand-controller {
+                               status = "okay";
+                               pinctrl-0 = <&pinctrl_nand_oe_we
+                                            &pinctrl_nand_cs
+                                            &pinctrl_nand_rb>;
+                               pinctrl-names = "default";
+
+                               nand@3 {
+                                       reg = <0x3 0x0 0x800000>;
+                                       rb-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;
+                                       cs-gpios = <&pioD 4 GPIO_ACTIVE_HIGH>;
+                                       nand-bus-width = <8>;
+                                       nand-ecc-mode = "hw";
+                                       nand-ecc-strength = <4>;
+                                       nand-ecc-step-size = <512>;
+                                       nand-on-flash-bbt;
+                                       label = "atmel_nand";
+
+                                       partitions {
+                                               compatible = "fixed-partitions";
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+
+                                               at91bootstrap@0 {
+                                                       label = "at91bootstrap";
+                                                       reg = <0x0 0x40000>;
+                                               };
+
+                                               uboot@40000 {
+                                                       label = "u-boot";
+                                                       reg = <0x40000 0x80000>;
+                                               };
+
+                                               ubootenv@c0000 {
+                                                       label = "U-Boot Env";
+                                                       reg = <0xc0000 0x140000>;
+                                               };
+
+                                               kernel@200000 {
+                                                       label = "kernel";
+                                                       reg = <0x200000 0x600000>;
+                                               };
+
+                                               rootfs@800000 {
+                                                       label = "rootfs";
+                                                       reg = <0x800000 0x0f800000>;
+                                               };
+                                       };
+                               };
                        };
                };
        };