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

Pull MTD updates from David Woodhouse:
 - Various cleanups especially in NAND tests
 - Add support for NAND flash on BCMA bus
 - DT support for sh_flctl and denali NAND drivers
 - Kill obsolete/superceded drivers (fortunet, nomadik_nand)
 - Fix JFFS2 locking bug in ENOMEM failure path
 - New SPI flash chips, as usual
 - Support writing in 'reliable mode' for DiskOnChip G4
 - Debugfs support in nandsim

* tag 'for-linus-20121219' of git://git.infradead.org/linux-mtd: (96 commits)
  mtd: nand: typo in nand_id_has_period() comments
  mtd: nand/gpio: use io{read,write}*_rep accessors
  mtd: block2mtd: throttle writes by calling balance_dirty_pages_ratelimited.
  mtd: nand: gpmi: reset BCH earlier, too, to avoid NAND startup problems
  mtd: nand/docg4: fix and improve read of factory bbt
  mtd: nand/docg4: reserve bb marker area in ecclayout
  mtd: nand/docg4: add support for writing in reliable mode
  mtd: mxc_nand: reorder part_probes to let cmdline override other sources
  mtd: mxc_nand: fix unbalanced clk_disable() in error path
  mtd: nandsim: Introduce debugfs infrastructure
  mtd: physmap_of: error checking to prevent a NULL pointer dereference
  mtg: docg3: potential divide by zero in doc_write_oob()
  mtd: bcm47xxnflash: writing support
  mtd: tests/read: initialize buffer for whole next page
  mtd: at91: atmel_nand: return bit flips for the PMECC read_page()
  mtd: fix recovery after failed write-buffer operation in cfi_cmdset_0002.c
  mtd: nand: onfi need to be probed in 8 bits mode
  mtd: nand: add NAND_BUSWIDTH_AUTO to autodetect bus width
  mtd: nand: print flash size during detection
  mted: nand_wait_ready timeout fix
  ...

5 files changed, 23 insertions, 23 deletions

diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index 009096d1d2c3..b4ca60f4eb42 100644
--- 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 {
diff --git a/arch/arm/boot/dts/spear300.dtsi b/arch/arm/boot/dts/spear300.dtsi
index 090adc656015..f79b3dfaabe6 100644
--- a/arch/arm/boot/dts/spear300.dtsi
+++ b/arch/arm/boot/dts/spear300.dtsi
@@ -38,10 +38,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x94000000 0x1000        /* FSMC Register */
-                               0x80000000 0x0010>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x20000>;
-                        st,cle-off = <0x10000>;
+                               0x80000000 0x0010        /* NAND Base DATA */
+                               0x80020000 0x0010        /* NAND Base ADDR */
+                               0x80010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index e814e5e97083..ab45b8c81982 100644
--- a/arch/arm/boot/dts/spear310.dtsi
+++ b/arch/arm/boot/dts/spear310.dtsi
@@ -33,10 +33,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x44000000 0x1000        /* FSMC Register */
-                               0x40000000 0x0010>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x10000>;
-                        st,cle-off = <0x20000>;
+                               0x40000000 0x0010        /* NAND Base DATA */
+                               0x40020000 0x0010        /* NAND Base ADDR */
+                               0x40010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi
index c056a84deabf..caa5520b1fd4 100644
--- a/arch/arm/boot/dts/spear320.dtsi
+++ b/arch/arm/boot/dts/spear320.dtsi
@@ -40,10 +40,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0x4c000000 0x1000        /* FSMC Register */
-                               0x50000000 0x0010>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x20000>;
-                        st,cle-off = <0x10000>;
+                               0x50000000 0x0010        /* NAND Base DATA */
+                               0x50020000 0x0010        /* NAND Base ADDR */
+                               0x50010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi
index e051dde5181f..19f99dc4115e 100644
--- a/arch/arm/boot/dts/spear600.dtsi
+++ b/arch/arm/boot/dts/spear600.dtsi
@@ -76,10 +76,10 @@
                         #address-cells = <1>;
                         #size-cells = <1>;
                         reg = <0xd1800000 0x1000        /* FSMC Register */
-                               0xd2000000 0x4000>;      /* NAND Base */
-                        reg-names = "fsmc_regs", "nand_data";
-                        st,ale-off = <0x20000>;
-                        st,cle-off = <0x10000>;
+                               0xd2000000 0x0010        /* NAND Base DATA */
+                               0xd2020000 0x0010        /* NAND Base ADDR */
+                               0xd2010000 0x0010>;      /* NAND Base CMD */
+                        reg-names = "fsmc_regs", "nand_data", "nand_addr", "nand_cmd";
                         status = "disabled";
                 };