Merge git://git.infradead.org/mtd-2.6

* git://git.infradead.org/mtd-2.6: (91 commits)
  [MTD] [NAND] Blackfin on-chip NAND Flash Controller driver
  [MTD] [NOR] fix ctrl-alt-del can't reboot for intel flash bug
  [MTD] [NAND] Fix compiler warning in Alauda driver
  [JFFS2] Remove stray debugging printk
  [JFFS2] Handle dirents on the flash with embedded zero bytes in names.
  [JFFS2] Check for creation of dirents with embedded zero bytes in name.
  [JFFS2] Don't count all 'very dirty' blocks except in debug mode
  [JFFS2] Check whether garbage-collection actually obsoleted its victim.
  [JFFS2] Relax threshold for triggering GC due to dirty blocks.
  [MTD] [OneNAND] Fix typo related with recent commit
  [JFFS2] Trigger garbage collection when very_dirty_list size becomes excessive
  [MTD] [NAND] Avoid deadlock in erase callback; release chip lock first.
  [MTD] [NAND] Resume method for CAFÉ NAND controller
  [MTD] [NAND] Fix PCI ident table for CAFÉ NAND controller.
  [MTD] [NAND] s3c2410: fix arch moves
  [MTD] [OneNAND] fix numerous races
  [MTD] map driver for NOR flash on the Intel Vermilion Range chipset
  [JFFS2] Fix unpoint length
  [MTD] fix CFI point method for discontiguous maps
  [MTD] MAPS: Merge Lubbock and Mainstone drivers into common PXA2xx driver
  ...

10 files changed, 92 insertions, 1 deletions

diff --git a/include/asm-blackfin/mach-bf548/dma.h b/include/asm-blackfin/mach-bf548/dma.h
index fcc8b4c34c6a..14cb10cc24ae 100644
--- a/include/asm-blackfin/mach-bf548/dma.h
+++ b/include/asm-blackfin/mach-bf548/dma.h
@@ -55,6 +55,7 @@
 #define CH_SPORT3_RX            20
 #define CH_SPORT3_TX            21
 #define CH_SDH                  22
+#define CH_NFC                  22
 #define CH_SPI2                 23
 
 #define CH_MEM_STREAM0_DEST     24
diff --git a/include/asm-blackfin/nand.h b/include/asm-blackfin/nand.h
new file mode 100644
index 000000000000..afbaafa793f1
--- /dev/null
+++ b/include/asm-blackfin/nand.h
@@ -0,0 +1,47 @@
+/* linux/include/asm-blackfin/nand.h
+ *
+ * Copyright (c) 2007 Analog Devices, Inc.
+ *      Bryan Wu <bryan.wu@analog.com>
+ *
+ * BF5XX - NAND flash controller platfrom_device info
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* struct bf5xx_nand_platform
+ *
+ * define a interface between platfrom board specific code and
+ * bf54x NFC driver.
+ *
+ * nr_partitions = number of partitions pointed to be partitoons (or zero)
+ * partitions    = mtd partition list
+ */
+
+#define NFC_PG_SIZE_256         0
+#define NFC_PG_SIZE_512         1
+#define NFC_PG_SIZE_OFFSET      9
+
+#define NFC_NWIDTH_8            0
+#define NFC_NWIDTH_16           1
+#define NFC_NWIDTH_OFFSET       8
+
+#define NFC_RDDLY_OFFSET        4
+#define NFC_WRDLY_OFFSET        0
+
+#define NFC_STAT_NBUSY          1
+
+struct bf5xx_nand_platform {
+        /* NAND chip information */
+        unsigned short          page_size;
+        unsigned short          data_width;
+
+        /* RD/WR strobe delay timing information, all times in SCLK cycles */
+        unsigned short          rd_dly;
+        unsigned short          wr_dly;
+
+        /* NAND MTD partition information */
+        int                     nr_partitions;
+        struct mtd_partition    *partitions;
+};
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index 840631fa5ff1..6b563cae23df 100644
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -46,6 +46,7 @@
 #define JFFS2_COMPR_COPY        0x04
 #define JFFS2_COMPR_DYNRUBIN    0x05
 #define JFFS2_COMPR_ZLIB        0x06
+#define JFFS2_COMPR_LZO         0x07
 /* Compatibility flags. */
 #define JFFS2_COMPAT_MASK 0xc000      /* What do to if an unknown nodetype is found */
 #define JFFS2_NODE_ACCURATE 0x2000
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 123948b14547..e17c5343cf51 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -57,6 +57,15 @@
 #define cfi_interleave_is_8(cfi) (0)
 #endif
 
+#ifndef cfi_interleave
+#warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work.
+static inline int cfi_interleave(void *cfi)
+{
+        BUG();
+        return 0;
+}
+#endif
+
 static inline int cfi_interleave_supported(int i)
 {
         switch (i) {
diff --git a/include/linux/mtd/flashchip.h b/include/linux/mtd/flashchip.h
index a293a3b78e05..39e7d2a1be9a 100644
--- a/include/linux/mtd/flashchip.h
+++ b/include/linux/mtd/flashchip.h
@@ -40,6 +40,7 @@ typedef enum {
         FL_POINT,
         FL_XIP_WHILE_ERASING,
         FL_XIP_WHILE_WRITING,
+        FL_SHUTDOWN,
         FL_UNKNOWN
 } flstate_t;
 
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 81f3a314dd76..a9fae032ba81 100644
--- a/include/linux/mtd/map.h
+++ b/include/linux/mtd/map.h
@@ -125,7 +125,15 @@
 #endif
 
 #ifndef map_bankwidth
-#error "No bus width supported. What's the point?"
+#warning "No CONFIG_MTD_MAP_BANK_WIDTH_xx selected. No NOR chip support can work"
+static inline int map_bankwidth(void *map)
+{
+        BUG();
+        return 0;
+}
+#define map_bankwidth_is_large(map) (0)
+#define map_words(map) (0)
+#define MAX_MAP_BANKWIDTH 1
 #endif
 
 static inline int map_bankwidth_supported(int w)
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index fd64ccfbce02..783fc983417c 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -133,6 +133,13 @@ struct mtd_info {
         int numeraseregions;
         struct mtd_erase_region_info *eraseregions;
 
+        /*
+         * Erase is an asynchronous operation.  Device drivers are supposed
+         * to call instr->callback() whenever the operation completes, even
+         * if it completes with a failure.
+         * Callers are supposed to pass a callback function and wait for it
+         * to be called before writing to the block.
+         */
         int (*erase) (struct mtd_info *mtd, struct erase_info *instr);
 
         /* This stuff for eXecute-In-Place */
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index d2365c8dcacc..c42bc7f533a5 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -432,6 +432,7 @@ struct nand_chip {
 #define NAND_MFR_STMICRO        0x20
 #define NAND_MFR_HYNIX          0xad
 #define NAND_MFR_MICRON         0x2c
+#define NAND_MFR_AMD            0x01
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index a56d24ada505..fd0a260e070b 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -60,6 +60,7 @@ struct onenand_bufferram {
  * @erase_shift:        [INTERN] number of address bits in a block
  * @page_shift:         [INTERN] number of address bits in a page
  * @page_mask:          [INTERN] a page per block mask
+ * @writesize:          [INTERN] a real page size
  * @bufferram_index:    [INTERN] BufferRAM index
  * @bufferram:          [INTERN] BufferRAM info
  * @readw:              [REPLACEABLE] hardware specific function for read short
@@ -100,6 +101,7 @@ struct onenand_chip {
         unsigned int            erase_shift;
         unsigned int            page_shift;
         unsigned int            page_mask;
+        unsigned int            writesize;
 
         unsigned int            bufferram_index;
         struct onenand_bufferram        bufferram[MAX_BUFFERRAM];
@@ -140,6 +142,8 @@ struct onenand_chip {
 #define ONENAND_NEXT_BUFFERRAM(this)            (this->bufferram_index ^ 1)
 #define ONENAND_SET_NEXT_BUFFERRAM(this)        (this->bufferram_index ^= 1)
 #define ONENAND_SET_PREV_BUFFERRAM(this)        (this->bufferram_index ^= 1)
+#define ONENAND_SET_BUFFERRAM0(this)            (this->bufferram_index = 0)
+#define ONENAND_SET_BUFFERRAM1(this)            (this->bufferram_index = 1)
 
 #define ONENAND_GET_SYS_CFG1(this)                                      \
         (this->read_word(this->base + ONENAND_REG_SYS_CFG1))
@@ -149,6 +153,13 @@ struct onenand_chip {
 #define ONENAND_IS_DDP(this)                                            \
         (this->device_id & ONENAND_DEVICE_IS_DDP)
 
+#ifdef CONFIG_MTD_ONENAND_2X_PROGRAM
+#define ONENAND_IS_2PLANE(this)                                         \
+        (this->options & ONENAND_HAS_2PLANE)
+#else
+#define ONENAND_IS_2PLANE(this)                 (0)
+#endif
+
 /* Check byte access in OneNAND */
 #define ONENAND_CHECK_BYTE_ACCESS(addr)         (addr & 0x1)
 
@@ -157,6 +168,7 @@ struct onenand_chip {
  */
 #define ONENAND_HAS_CONT_LOCK           (0x0001)
 #define ONENAND_HAS_UNLOCK_ALL          (0x0002)
+#define ONENAND_HAS_2PLANE              (0x0004)
 #define ONENAND_PAGEBUF_ALLOC           (0x1000)
 #define ONENAND_OOBBUF_ALLOC            (0x2000)
 
diff --git a/include/linux/mtd/onenand_regs.h b/include/linux/mtd/onenand_regs.h
index af94719890e7..c46161f4eee3 100644
--- a/include/linux/mtd/onenand_regs.h
+++ b/include/linux/mtd/onenand_regs.h
@@ -74,6 +74,8 @@
 
 #define ONENAND_DEVICE_DENSITY_512Mb    (0x002)
 #define ONENAND_DEVICE_DENSITY_1Gb      (0x003)
+#define ONENAND_DEVICE_DENSITY_2Gb      (0x004)
+#define ONENAND_DEVICE_DENSITY_4Gb      (0x005)
 
 /*
  * Version ID Register F002h (R)
@@ -111,6 +113,8 @@
 #define ONENAND_CMD_READOOB             (0x13)
 #define ONENAND_CMD_PROG                (0x80)
 #define ONENAND_CMD_PROGOOB             (0x1A)
+#define ONENAND_CMD_2X_PROG             (0x7D)
+#define ONENAND_CMD_2X_CACHE_PROG       (0x7F)
 #define ONENAND_CMD_UNLOCK              (0x23)
 #define ONENAND_CMD_LOCK                (0x2A)
 #define ONENAND_CMD_LOCK_TIGHT          (0x2C)