Merge tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd

[android-sdk/kernel-video.git] / arch / arm / boot / dts / spear13xx.dtsi

diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 009096d1d2c37694bbd30d82f90ee294bbe18b2c..b4ca60f4eb42dabf24adfb7f47e1da0471381fc9 100644 (file)
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -73,7 +73,7 @@
                                400000
                                500000
                                600000 >;
-               status = "disable";
+               status = "disabled";
        };
 
        ahb {
@@ -118,15 +118,15 @@
                        compatible = "st,spear600-fsmc-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       reg = <0xb0000000 0x1000        /* FSMC Register */
-                              0xb0800000 0x0010>;      /* NAND Base */
-                       reg-names = "fsmc_regs", "nand_data";
+                       reg = <0xb0000000 0x1000        /* FSMC Register*/
+                              0xb0800000 0x0010        /* NAND Base DATA */
+                              0xb0820000 0x0010        /* NAND Base ADDR */
+                              0xb0810000 0x0010>;      /* NAND Base CMD */
+                       reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                        interrupts = <0 20 0x4
                                      0 21 0x4
                                      0 22 0x4
                                      0 23 0x4>;
-                       st,ale-off = <0x20000>;
-                       st,cle-off = <0x10000>;
                        st,mode = <2>;
                        status = "disabled";
                };
@@ -144,7 +144,7 @@
                        compatible = "st,pcm-audio";
                        #address-cells = <0>;
                        #size-cells = <0>;
-                       status = "disable";
+                       status = "disabled";
                };
 
                smi: flash@ea000000 {