70 files changed, 6480 insertions, 5004 deletions

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 0fe0b61ef00a..1344ad7a4b14 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -78,7 +78,7 @@ config MTD_REDBOOT_DIRECTORY_BLOCK
           option.
 
           The option specifies which Flash sectors holds the RedBoot
-          partition table.  A zero or positive value gives an absolete
+          partition table.  A zero or positive value gives an absolute
           erase block number. A negative value specifies a number of
           sectors before the end of the device.
 
@@ -103,7 +103,7 @@ config MTD_CMDLINE_PARTS
         bool "Command line partition table parsing"
         depends on MTD_PARTITIONS = "y"
         ---help---
-          Allow generic configuration of the MTD paritition tables via the kernel
+          Allow generic configuration of the MTD partition tables via the kernel
           command line. Multiple flash resources are supported for hardware where
           different kinds of flash memory are available.
 
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index a7ec5954caf5..6d8f30deb868 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -30,7 +30,6 @@ config MTD_JEDECPROBE
 
 config MTD_GEN_PROBE
         tristate
-        select OBSOLETE_INTERMODULE
 
 config MTD_CFI_ADV_OPTIONS
         bool "Flash chip driver advanced configuration options"
diff --git a/drivers/mtd/chips/Makefile b/drivers/mtd/chips/Makefile
index 8afe3092c4e3..75bc1c2a0f43 100644
--- a/drivers/mtd/chips/Makefile
+++ b/drivers/mtd/chips/Makefile
@@ -3,13 +3,6 @@
 #
 # $Id: Makefile.common,v 1.5 2005/11/07 11:14:22 gleixner Exp $
 
-#                       *** BIG UGLY NOTE ***
-#
-# The removal of get_module_symbol() and replacement with
-# inter_module_register() et al has introduced a link order dependency
-# here where previously there was none.  We now have to ensure that
-# the CFI command set drivers are linked before gen_probe.o
-
 obj-$(CONFIG_MTD)               += chipreg.o
 obj-$(CONFIG_MTD_AMDSTD)        += amd_flash.o
 obj-$(CONFIG_MTD_CFI)           += cfi_probe.o
diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index 57115618c496..16eaca69fb5a 100644
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -97,7 +97,6 @@ struct amd_flash_private {
         int interleave;
         int numchips;
         unsigned long chipshift;
-//      const char *im_name;
         struct flchip chips[0];
 };
 
@@ -131,12 +130,6 @@ static struct mtd_chip_driver amd_flash_chipdrv = {
         .module = THIS_MODULE
 };
 
-
-
-static const char im_name[] = "amd_flash";
-
-
-
 static inline __u32 wide_read(struct map_info *map, __u32 addr)
 {
         if (map->buswidth == 1) {
@@ -737,6 +730,7 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
                 offset += dev_size;
         }
         mtd->type = MTD_NORFLASH;
+        mtd->writesize = 1;
         mtd->flags = MTD_CAP_NORFLASH;
         mtd->name = map->name;
         mtd->erase = amd_flash_erase;
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 1c074d63ff3a..0d435814aaa1 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -331,13 +331,6 @@ read_pri_intelext(struct map_info *map, __u16 adr)
         return extp;
 }
 
-/* This routine is made available to other mtd code via
- * inter_module_register.  It must only be accessed through
- * inter_module_get which will bump the use count of this module.  The
- * addresses passed back in cfi are valid as long as the use count of
- * this module is non-zero, i.e. between inter_module_get and
- * inter_module_put.  Keith Owens <kaos@ocs.com.au> 29 Oct 2000.
- */
 struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
 {
         struct cfi_private *cfi = map->fldrv_priv;
@@ -406,7 +399,7 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
         for (i=0; i< cfi->numchips; i++) {
                 cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp;
                 cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp;
-                cfi->chips[i].erase_time = 1<<cfi->cfiq->BlockEraseTimeoutTyp;
+                cfi->chips[i].erase_time = 1000<<cfi->cfiq->BlockEraseTimeoutTyp;
                 cfi->chips[i].ref_point_counter = 0;
                 init_waitqueue_head(&(cfi->chips[i].wq));
         }
@@ -415,6 +408,11 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
 
         return cfi_intelext_setup(mtd);
 }
+struct mtd_info *cfi_cmdset_0003(struct map_info *map, int primary) __attribute__((alias("cfi_cmdset_0001")));
+struct mtd_info *cfi_cmdset_0200(struct map_info *map, int primary) __attribute__((alias("cfi_cmdset_0001")));
+EXPORT_SYMBOL_GPL(cfi_cmdset_0001);
+EXPORT_SYMBOL_GPL(cfi_cmdset_0003);
+EXPORT_SYMBOL_GPL(cfi_cmdset_0200);
 
 static struct mtd_info *cfi_intelext_setup(struct mtd_info *mtd)
 {
@@ -547,12 +545,12 @@ static int cfi_intelext_partition_fixup(struct mtd_info *mtd,
                 if (extp->MinorVersion >= '4') {
                         struct cfi_intelext_programming_regioninfo *prinfo;
                         prinfo = (struct cfi_intelext_programming_regioninfo *)&extp->extra[offs];
-                        MTD_PROGREGION_SIZE(mtd) = cfi->interleave << prinfo->ProgRegShift;
+                        mtd->writesize = cfi->interleave << prinfo->ProgRegShift;
                         MTD_PROGREGION_CTRLMODE_VALID(mtd) = cfi->interleave * prinfo->ControlValid;
                         MTD_PROGREGION_CTRLMODE_INVALID(mtd) = cfi->interleave * prinfo->ControlInvalid;
-                        mtd->flags |= MTD_PROGRAM_REGIONS;
+                        mtd->flags &= ~MTD_BIT_WRITEABLE;
                         printk(KERN_DEBUG "%s: program region size/ctrl_valid/ctrl_inval = %d/%d/%d\n",
-                               map->name, MTD_PROGREGION_SIZE(mtd),
+                               map->name, mtd->writesize,
                                MTD_PROGREGION_CTRLMODE_VALID(mtd),
                                MTD_PROGREGION_CTRLMODE_INVALID(mtd));
                 }
@@ -896,26 +894,33 @@ static void __xipram xip_enable(struct map_info *map, struct flchip *chip,
 
 /*
  * When a delay is required for the flash operation to complete, the
- * xip_udelay() function is polling for both the given timeout and pending
- * (but still masked) hardware interrupts.  Whenever there is an interrupt
- * pending then the flash erase or write operation is suspended, array mode
- * restored and interrupts unmasked.  Task scheduling might also happen at that
- * point.  The CPU eventually returns from the interrupt or the call to
- * schedule() and the suspended flash operation is resumed for the remaining
- * of the delay period.
+ * xip_wait_for_operation() function is polling for both the given timeout
+ * and pending (but still masked) hardware interrupts.  Whenever there is an
+ * interrupt pending then the flash erase or write operation is suspended,
+ * array mode restored and interrupts unmasked.  Task scheduling might also
+ * happen at that point.  The CPU eventually returns from the interrupt or
+ * the call to schedule() and the suspended flash operation is resumed for
+ * the remaining of the delay period.
  *
  * Warning: this function _will_ fool interrupt latency tracing tools.
  */
 
-static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
-                                unsigned long adr, int usec)
+static int __xipram xip_wait_for_operation(
+                struct map_info *map, struct flchip *chip,
+                unsigned long adr, int *chip_op_time )
 {
         struct cfi_private *cfi = map->fldrv_priv;
         struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
         map_word status, OK = CMD(0x80);
-        unsigned long suspended, start = xip_currtime();
+        unsigned long usec, suspended, start, done;
         flstate_t oldstate, newstate;
 
+        start = xip_currtime();
+        usec = *chip_op_time * 8;
+        if (usec == 0)
+                usec = 500000;
+        done = 0;
+
         do {
                 cpu_relax();
                 if (xip_irqpending() && cfip &&
@@ -932,9 +937,9 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
                          * we resume the whole thing at once).  Yes, it
                          * can happen!
                          */
+                        usec -= done;
                         map_write(map, CMD(0xb0), adr);
                         map_write(map, CMD(0x70), adr);
-                        usec -= xip_elapsed_since(start);
                         suspended = xip_currtime();
                         do {
                                 if (xip_elapsed_since(suspended) > 100000) {
@@ -944,7 +949,7 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
                                          * This is a critical error but there
                                          * is not much we can do here.
                                          */
-                                        return;
+                                        return -EIO;
                                 }
                                 status = map_read(map, adr);
                         } while (!map_word_andequal(map, status, OK, OK));
@@ -1004,65 +1009,107 @@ static void __xipram xip_udelay(struct map_info *map, struct flchip *chip,
                         xip_cpu_idle();
                 }
                 status = map_read(map, adr);
+                done = xip_elapsed_since(start);
         } while (!map_word_andequal(map, status, OK, OK)
-                 && xip_elapsed_since(start) < usec);
-}
+                 && done < usec);
 
-#define UDELAY(map, chip, adr, usec)  xip_udelay(map, chip, adr, usec)
+        return (done >= usec) ? -ETIME : 0;
+}
 
 /*
  * The INVALIDATE_CACHED_RANGE() macro is normally used in parallel while
  * the flash is actively programming or erasing since we have to poll for
  * the operation to complete anyway.  We can't do that in a generic way with
  * a XIP setup so do it before the actual flash operation in this case
- * and stub it out from INVALIDATE_CACHE_UDELAY.
+ * and stub it out from INVAL_CACHE_AND_WAIT.
  */
 #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
         INVALIDATE_CACHED_RANGE(map, from, size)
 
-#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \
-        UDELAY(map, chip, cmd_adr, usec)
-
-/*
- * Extra notes:
- *
- * Activating this XIP support changes the way the code works a bit.  For
- * example the code to suspend the current process when concurrent access
- * happens is never executed because xip_udelay() will always return with the
- * same chip state as it was entered with.  This is why there is no care for
- * the presence of add_wait_queue() or schedule() calls from within a couple
- * xip_disable()'d  areas of code, like in do_erase_oneblock for example.
- * The queueing and scheduling are always happening within xip_udelay().
- *
- * Similarly, get_chip() and put_chip() just happen to always be executed
- * with chip->state set to FL_READY (or FL_XIP_WHILE_*) where flash state
- * is in array mode, therefore never executing many cases therein and not
- * causing any problem with XIP.
- */
+#define INVAL_CACHE_AND_WAIT(map, chip, cmd_adr, inval_adr, inval_len, p_usec) \
+        xip_wait_for_operation(map, chip, cmd_adr, p_usec)
 
 #else
 
 #define xip_disable(map, chip, adr)
 #define xip_enable(map, chip, adr)
 #define XIP_INVAL_CACHED_RANGE(x...)
+#define INVAL_CACHE_AND_WAIT inval_cache_and_wait_for_operation
+
+static int inval_cache_and_wait_for_operation(
+                struct map_info *map, struct flchip *chip,
+                unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
+                int *chip_op_time )
+{
+        struct cfi_private *cfi = map->fldrv_priv;
+        map_word status, status_OK = CMD(0x80);
+        int z, chip_state = chip->state;
+        unsigned long timeo;
+
+        spin_unlock(chip->mutex);
+        if (inval_len)
+                INVALIDATE_CACHED_RANGE(map, inval_adr, inval_len);
+        if (*chip_op_time)
+                cfi_udelay(*chip_op_time);
+        spin_lock(chip->mutex);
+
+        timeo = *chip_op_time * 8 * HZ / 1000000;
+        if (timeo < HZ/2)
+                timeo = HZ/2;
+        timeo += jiffies;
+
+        z = 0;
+        for (;;) {
+                if (chip->state != chip_state) {
+                        /* Someone's suspended the operation: sleep */
+                        DECLARE_WAITQUEUE(wait, current);
+
+                        set_current_state(TASK_UNINTERRUPTIBLE);
+                        add_wait_queue(&chip->wq, &wait);
+                        spin_unlock(chip->mutex);
+                        schedule();
+                        remove_wait_queue(&chip->wq, &wait);
+                        timeo = jiffies + (HZ / 2); /* FIXME */
+                        spin_lock(chip->mutex);
+                        continue;
+                }
 
-#define UDELAY(map, chip, adr, usec)  \
-do {  \
-        spin_unlock(chip->mutex);  \
-        cfi_udelay(usec);  \
-        spin_lock(chip->mutex);  \
-} while (0)
-
-#define INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr, adr, len, usec)  \
-do {  \
-        spin_unlock(chip->mutex);  \
-        INVALIDATE_CACHED_RANGE(map, adr, len);  \
-        cfi_udelay(usec);  \
-        spin_lock(chip->mutex);  \
-} while (0)
+                status = map_read(map, cmd_adr);
+                if (map_word_andequal(map, status, status_OK, status_OK))
+                        break;
+
+                /* OK Still waiting */
+                if (time_after(jiffies, timeo)) {
+                        map_write(map, CMD(0x70), cmd_adr);
+                        chip->state = FL_STATUS;
+                        return -ETIME;
+                }
+
+                /* Latency issues. Drop the lock, wait a while and retry */
+                z++;
+                spin_unlock(chip->mutex);
+                cfi_udelay(1);
+                spin_lock(chip->mutex);
+        }
+
+        if (!z) {
+                if (!--(*chip_op_time))
+                        *chip_op_time = 1;
+        } else if (z > 1)
+                ++(*chip_op_time);
+
+        /* Done and happy. */
+        chip->state = FL_STATUS;
+        return 0;
+}
 
 #endif
 
+#define WAIT_TIMEOUT(map, chip, adr, udelay) \
+        ({ int __udelay = (udelay); \
+           INVAL_CACHE_AND_WAIT(map, chip, adr, 0, 0, &__udelay); })
+
+
 static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
 {
         unsigned long cmd_addr;
@@ -1252,14 +1299,11 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
                                      unsigned long adr, map_word datum, int mode)
 {
         struct cfi_private *cfi = map->fldrv_priv;
-        map_word status, status_OK, write_cmd;
-        unsigned long timeo;
-        int z, ret=0;
+        map_word status, write_cmd;
+        int ret=0;
 
         adr += chip->start;
 
-        /* Let's determine those according to the interleave only once */
-        status_OK = CMD(0x80);
         switch (mode) {
         case FL_WRITING:
                 write_cmd = (cfi->cfiq->P_ID != 0x0200) ? CMD(0x40) : CMD(0x41);
@@ -1285,57 +1329,17 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip,
         map_write(map, datum, adr);
         chip->state = mode;
 
-        INVALIDATE_CACHE_UDELAY(map, chip, adr,
-                                adr, map_bankwidth(map),
-                                chip->word_write_time);
-
-        timeo = jiffies + (HZ/2);
-        z = 0;
-        for (;;) {
-                if (chip->state != mode) {
-                        /* Someone's suspended the write. Sleep */
-                        DECLARE_WAITQUEUE(wait, current);
-
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        add_wait_queue(&chip->wq, &wait);
-                        spin_unlock(chip->mutex);
-                        schedule();
-                        remove_wait_queue(&chip->wq, &wait);
-                        timeo = jiffies + (HZ / 2); /* FIXME */
-                        spin_lock(chip->mutex);
-                        continue;
-                }
-
-                status = map_read(map, adr);
-                if (map_word_andequal(map, status, status_OK, status_OK))
-                        break;
-
-                /* OK Still waiting */
-                if (time_after(jiffies, timeo)) {
-                        map_write(map, CMD(0x70), adr);
-                        chip->state = FL_STATUS;
-                        xip_enable(map, chip, adr);
-                        printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
-                        ret = -EIO;
-                        goto out;
-                }
-
-                /* Latency issues. Drop the lock, wait a while and retry */
-                z++;
-                UDELAY(map, chip, adr, 1);
-        }
-        if (!z) {
-                chip->word_write_time--;
-                if (!chip->word_write_time)
-                        chip->word_write_time = 1;
+        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
+                                   adr, map_bankwidth(map),
+                                   &chip->word_write_time);
+        if (ret) {
+                xip_enable(map, chip, adr);
+                printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
+                goto out;
         }
-        if (z > 1)
-                chip->word_write_time++;
-
-        /* Done and happy. */
-        chip->state = FL_STATUS;
 
         /* check for errors */
+        status = map_read(map, adr);
         if (map_word_bitsset(map, status, CMD(0x1a))) {
                 unsigned long chipstatus = MERGESTATUS(status);
 
@@ -1452,9 +1456,9 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
                                     unsigned long *pvec_seek, int len)
 {
         struct cfi_private *cfi = map->fldrv_priv;
-        map_word status, status_OK, write_cmd, datum;
-        unsigned long cmd_adr, timeo;
-        int wbufsize, z, ret=0, word_gap, words;
+        map_word status, write_cmd, datum;
+        unsigned long cmd_adr;
+        int ret, wbufsize, word_gap, words;
         const struct kvec *vec;
         unsigned long vec_seek;
 
@@ -1463,7 +1467,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         cmd_adr = adr & ~(wbufsize-1);
 
         /* Let's determine this according to the interleave only once */
-        status_OK = CMD(0x80);
         write_cmd = (cfi->cfiq->P_ID != 0x0200) ? CMD(0xe8) : CMD(0xe9);
 
         spin_lock(chip->mutex);
@@ -1477,12 +1480,14 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         ENABLE_VPP(map);
         xip_disable(map, chip, cmd_adr);
 
-        /* §4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set
+        /* §4.8 of the 28FxxxJ3A datasheet says "Any time SR.4 and/or SR.5 is set
            [...], the device will not accept any more Write to Buffer commands".
            So we must check here and reset those bits if they're set. Otherwise
            we're just pissing in the wind */
-        if (chip->state != FL_STATUS)
+        if (chip->state != FL_STATUS) {
                 map_write(map, CMD(0x70), cmd_adr);
+                chip->state = FL_STATUS;
+        }
         status = map_read(map, cmd_adr);
         if (map_word_bitsset(map, status, CMD(0x30))) {
                 xip_enable(map, chip, cmd_adr);
@@ -1493,32 +1498,20 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         }
 
         chip->state = FL_WRITING_TO_BUFFER;
-
-        z = 0;
-        for (;;) {
-                map_write(map, write_cmd, cmd_adr);
-
+        map_write(map, write_cmd, cmd_adr);
+        ret = WAIT_TIMEOUT(map, chip, cmd_adr, 0);
+        if (ret) {
+                /* Argh. Not ready for write to buffer */
+                map_word Xstatus = map_read(map, cmd_adr);
+                map_write(map, CMD(0x70), cmd_adr);
+                chip->state = FL_STATUS;
                 status = map_read(map, cmd_adr);
-                if (map_word_andequal(map, status, status_OK, status_OK))
-                        break;
-
-                UDELAY(map, chip, cmd_adr, 1);
-
-                if (++z > 20) {
-                        /* Argh. Not ready for write to buffer */
-                        map_word Xstatus;
-                        map_write(map, CMD(0x70), cmd_adr);
-                        chip->state = FL_STATUS;
-                        Xstatus = map_read(map, cmd_adr);
-                        /* Odd. Clear status bits */
-                        map_write(map, CMD(0x50), cmd_adr);
-                        map_write(map, CMD(0x70), cmd_adr);
-                        xip_enable(map, chip, cmd_adr);
-                        printk(KERN_ERR "%s: Chip not ready for buffer write. status = %lx, Xstatus = %lx\n",
-                               map->name, status.x[0], Xstatus.x[0]);
-                        ret = -EIO;
-                        goto out;
-                }
+                map_write(map, CMD(0x50), cmd_adr);
+                map_write(map, CMD(0x70), cmd_adr);
+                xip_enable(map, chip, cmd_adr);
+                printk(KERN_ERR "%s: Chip not ready for buffer write. Xstatus = %lx, status = %lx\n",
+                                map->name, Xstatus.x[0], status.x[0]);
+                goto out;
         }
 
         /* Figure out the number of words to write */
@@ -1573,56 +1566,19 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
         map_write(map, CMD(0xd0), cmd_adr);
         chip->state = FL_WRITING;
 
-        INVALIDATE_CACHE_UDELAY(map, chip, cmd_adr,
-                                adr, len,
-                                chip->buffer_write_time);
-
-        timeo = jiffies + (HZ/2);
-        z = 0;
-        for (;;) {
-                if (chip->state != FL_WRITING) {
-                        /* Someone's suspended the write. Sleep */
-                        DECLARE_WAITQUEUE(wait, current);
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        add_wait_queue(&chip->wq, &wait);
-                        spin_unlock(chip->mutex);
-                        schedule();
-                        remove_wait_queue(&chip->wq, &wait);
-                        timeo = jiffies + (HZ / 2); /* FIXME */
-                        spin_lock(chip->mutex);
-                        continue;
-                }
-
-                status = map_read(map, cmd_adr);
-                if (map_word_andequal(map, status, status_OK, status_OK))
-                        break;
-
-                /* OK Still waiting */
-                if (time_after(jiffies, timeo)) {
-                        map_write(map, CMD(0x70), cmd_adr);
-                        chip->state = FL_STATUS;
-                        xip_enable(map, chip, cmd_adr);
-                        printk(KERN_ERR "%s: buffer write error (status timeout)\n", map->name);
-                        ret = -EIO;
-                        goto out;
-                }
-
-                /* Latency issues. Drop the lock, wait a while and retry */
-                z++;
-                UDELAY(map, chip, cmd_adr, 1);
-        }
-        if (!z) {
-                chip->buffer_write_time--;
-                if (!chip->buffer_write_time)
-                        chip->buffer_write_time = 1;
+        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
+                                   adr, len,
+                                   &chip->buffer_write_time);
+        if (ret) {
+                map_write(map, CMD(0x70), cmd_adr);
+                chip->state = FL_STATUS;
+                xip_enable(map, chip, cmd_adr);
+                printk(KERN_ERR "%s: buffer write error (status timeout)\n", map->name);
+                goto out;
         }
-        if (z > 1)
-                chip->buffer_write_time++;
-
-        /* Done and happy. */
-        chip->state = FL_STATUS;
 
         /* check for errors */
+        status = map_read(map, cmd_adr);
         if (map_word_bitsset(map, status, CMD(0x1a))) {
                 unsigned long chipstatus = MERGESTATUS(status);
 
@@ -1693,6 +1649,11 @@ static int cfi_intelext_writev (struct mtd_info *mtd, const struct kvec *vecs,
                         if (chipnum == cfi->numchips)
                                 return 0;
                 }
+
+                /* Be nice and reschedule with the chip in a usable state for other
+                   processes. */
+                cond_resched();
+
         } while (len);
 
         return 0;
@@ -1713,17 +1674,12 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
                                       unsigned long adr, int len, void *thunk)
 {
         struct cfi_private *cfi = map->fldrv_priv;
-        map_word status, status_OK;
-        unsigned long timeo;
+        map_word status;
         int retries = 3;
-        DECLARE_WAITQUEUE(wait, current);
-        int ret = 0;
+        int ret;
 
         adr += chip->start;
 
-        /* Let's determine this according to the interleave only once */
-        status_OK = CMD(0x80);
-
  retry:
         spin_lock(chip->mutex);
         ret = get_chip(map, chip, adr, FL_ERASING);
@@ -1745,48 +1701,15 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
         chip->state = FL_ERASING;
         chip->erase_suspended = 0;
 
-        INVALIDATE_CACHE_UDELAY(map, chip, adr,
-                                adr, len,
-                                chip->erase_time*1000/2);
-
-        /* FIXME. Use a timer to check this, and return immediately. */
-        /* Once the state machine's known to be working I'll do that */
-
-        timeo = jiffies + (HZ*20);
-        for (;;) {
-                if (chip->state != FL_ERASING) {
-                        /* Someone's suspended the erase. Sleep */
-                        set_current_state(TASK_UNINTERRUPTIBLE);
-                        add_wait_queue(&chip->wq, &wait);
-                        spin_unlock(chip->mutex);
-                        schedule();
-                        remove_wait_queue(&chip->wq, &wait);
-                        spin_lock(chip->mutex);
-                        continue;
-                }
-                if (chip->erase_suspended) {
-                        /* This erase was suspended and resumed.
-                           Adjust the timeout */
-                        timeo = jiffies + (HZ*20); /* FIXME */
-                        chip->erase_suspended = 0;
-                }
-
-                status = map_read(map, adr);
-                if (map_word_andequal(map, status, status_OK, status_OK))
-                        break;
-
-                /* OK Still waiting */
-                if (time_after(jiffies, timeo)) {
-                        map_write(map, CMD(0x70), adr);
-                        chip->state = FL_STATUS;
-                        xip_enable(map, chip, adr);
-                        printk(KERN_ERR "%s: block erase error: (status timeout)\n", map->name);
-                        ret = -EIO;
-                        goto out;
-                }
-
-                /* Latency issues. Drop the lock, wait a while and retry */
-                UDELAY(map, chip, adr, 1000000/HZ);
+        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
+                                   adr, len,
+                                   &chip->erase_time);
+        if (ret) {
+                map_write(map, CMD(0x70), adr);
+                chip->state = FL_STATUS;
+                xip_enable(map, chip, adr);
+                printk(KERN_ERR "%s: block erase error: (status timeout)\n", map->name);
+                goto out;
         }
 
         /* We've broken this before. It doesn't hurt to be safe */
@@ -1815,7 +1738,6 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
                         ret = -EIO;
                 } else if (chipstatus & 0x20 && retries--) {
                         printk(KERN_DEBUG "block erase failed at 0x%08lx: status 0x%lx. Retrying...\n", adr, chipstatus);
-                        timeo = jiffies + HZ;
                         put_chip(map, chip, adr);
                         spin_unlock(chip->mutex);
                         goto retry;
@@ -1921,15 +1843,11 @@ static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip
 {
         struct cfi_private *cfi = map->fldrv_priv;
         struct cfi_pri_intelext *extp = cfi->cmdset_priv;
-        map_word status, status_OK;
-        unsigned long timeo = jiffies + HZ;
+        int udelay;
         int ret;
 
         adr += chip->start;
 
-        /* Let's determine this according to the interleave only once */
-        status_OK = CMD(0x80);
-
         spin_lock(chip->mutex);
         ret = get_chip(map, chip, adr, FL_LOCKING);
         if (ret) {
@@ -1954,41 +1872,21 @@ static int __xipram do_xxlock_oneblock(struct map_info *map, struct flchip *chip
          * If Instant Individual Block Locking supported then no need
          * to delay.
          */
+        udelay = (!extp || !(extp->FeatureSupport & (1 << 5))) ? 1000000/HZ : 0;
 
-        if (!extp || !(extp->FeatureSupport & (1 << 5)))
-                UDELAY(map, chip, adr, 1000000/HZ);
-
-        /* FIXME. Use a timer to check this, and return immediately. */
-        /* Once the state machine's known to be working I'll do that */
-
-        timeo = jiffies + (HZ*20);
-        for (;;) {
-
-                status = map_read(map, adr);
-                if (map_word_andequal(map, status, status_OK, status_OK))
-                        break;
-
-                /* OK Still waiting */
-                if (time_after(jiffies, timeo)) {
-                        map_write(map, CMD(0x70), adr);
-                        chip->state = FL_STATUS;
-                        xip_enable(map, chip, adr);
-                        printk(KERN_ERR "%s: block unlock error: (status timeout)\n", map->name);
-                        put_chip(map, chip, adr);
-                        spin_unlock(chip->mutex);
-                        return -EIO;
-                }
-
-                /* Latency issues. Drop the lock, wait a while and retry */
-                UDELAY(map, chip, adr, 1);
+        ret = WAIT_TIMEOUT(map, chip, adr, udelay);
+        if (ret) {
+                map_write(map, CMD(0x70), adr);
+                chip->state = FL_STATUS;
+                xip_enable(map, chip, adr);
+                printk(KERN_ERR "%s: block unlock error: (status timeout)\n", map->name);
+                goto out;
         }
 
-        /* Done and happy. */
-        chip->state = FL_STATUS;
         xip_enable(map, chip, adr);
-        put_chip(map, chip, adr);
+out:    put_chip(map, chip, adr);
         spin_unlock(chip->mutex);
-        return 0;
+        return ret;
 }
 
 static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
@@ -2445,28 +2343,8 @@ static void cfi_intelext_destroy(struct mtd_info *mtd)
         kfree(mtd->eraseregions);
 }
 
-static char im_name_0001[] = "cfi_cmdset_0001";
-static char im_name_0003[] = "cfi_cmdset_0003";
-static char im_name_0200[] = "cfi_cmdset_0200";
-
-static int __init cfi_intelext_init(void)
-{
-        inter_module_register(im_name_0001, THIS_MODULE, &cfi_cmdset_0001);
-        inter_module_register(im_name_0003, THIS_MODULE, &cfi_cmdset_0001);
-        inter_module_register(im_name_0200, THIS_MODULE, &cfi_cmdset_0001);
-        return 0;
-}
-
-static void __exit cfi_intelext_exit(void)
-{
-        inter_module_unregister(im_name_0001);
-        inter_module_unregister(im_name_0003);
-        inter_module_unregister(im_name_0200);
-}
-
-module_init(cfi_intelext_init);
-module_exit(cfi_intelext_exit);
-
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org> et al.");
 MODULE_DESCRIPTION("MTD chip driver for Intel/Sharp flash chips");
+MODULE_ALIAS("cfi_cmdset_0003");
+MODULE_ALIAS("cfi_cmdset_0200");
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index aed10bd5c3c3..1e01ad38b26e 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -236,6 +236,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
         mtd->resume  = cfi_amdstd_resume;
         mtd->flags   = MTD_CAP_NORFLASH;
         mtd->name    = map->name;
+        mtd->writesize = 1;
 
         if (cfi->cfi_mode==CFI_MODE_CFI){
                 unsigned char bootloc;
@@ -326,7 +327,7 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
 
         return cfi_amdstd_setup(mtd);
 }
-
+EXPORT_SYMBOL_GPL(cfi_cmdset_0002);
 
 static struct mtd_info *cfi_amdstd_setup(struct mtd_info *mtd)
 {
@@ -1758,25 +1759,6 @@ static void cfi_amdstd_destroy(struct mtd_info *mtd)
         kfree(mtd->eraseregions);
 }
 
-static char im_name[]="cfi_cmdset_0002";
-
-
-static int __init cfi_amdstd_init(void)
-{
-        inter_module_register(im_name, THIS_MODULE, &cfi_cmdset_0002);
-        return 0;
-}
-
-
-static void __exit cfi_amdstd_exit(void)
-{
-        inter_module_unregister(im_name);
-}
-
-
-module_init(cfi_amdstd_init);
-module_exit(cfi_amdstd_exit);
-
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Crossnet Co. <info@crossnet.co.jp> et al.");
 MODULE_DESCRIPTION("MTD chip driver for AMD/Fujitsu flash chips");
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index 0807c1c91e55..fae70a5db540 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -162,6 +162,7 @@ struct mtd_info *cfi_cmdset_0020(struct map_info *map, int primary)
 
         return cfi_staa_setup(map);
 }
+EXPORT_SYMBOL_GPL(cfi_cmdset_0020);
 
 static struct mtd_info *cfi_staa_setup(struct map_info *map)
 {
@@ -237,9 +238,8 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
         mtd->unlock = cfi_staa_unlock;
         mtd->suspend = cfi_staa_suspend;
         mtd->resume = cfi_staa_resume;
-        mtd->flags = MTD_CAP_NORFLASH;
-        mtd->flags |= MTD_ECC; /* FIXME: Not all STMicro flashes have this */
-        mtd->eccsize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */
+        mtd->flags = MTD_CAP_NORFLASH & ~MTD_BIT_WRITEABLE;
+        mtd->writesize = 8; /* FIXME: Should be 0 for STMicro flashes w/out ECC */
         map->fldrv = &cfi_staa_chipdrv;
         __module_get(THIS_MODULE);
         mtd->name = map->name;
@@ -1410,20 +1410,4 @@ static void cfi_staa_destroy(struct mtd_info *mtd)
         kfree(cfi);
 }
 
-static char im_name[]="cfi_cmdset_0020";
-
-static int __init cfi_staa_init(void)
-{
-        inter_module_register(im_name, THIS_MODULE, &cfi_cmdset_0020);
-        return 0;
-}
-
-static void __exit cfi_staa_exit(void)
-{
-        inter_module_unregister(im_name);
-}
-
-module_init(cfi_staa_init);
-module_exit(cfi_staa_exit);
-
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/chips/cfi_probe.c b/drivers/mtd/chips/cfi_probe.c
index e636aa86bc24..4bf9f8cac0dd 100644
--- a/drivers/mtd/chips/cfi_probe.c
+++ b/drivers/mtd/chips/cfi_probe.c
@@ -349,12 +349,12 @@ static void print_cfi_ident(struct cfi_ident *cfip)
         else
                 printk("No Vpp line\n");
 
-        printk("Typical byte/word write timeout: %d µs\n", 1<<cfip->WordWriteTimeoutTyp);
-        printk("Maximum byte/word write timeout: %d µs\n", (1<<cfip->WordWriteTimeoutMax) * (1<<cfip->WordWriteTimeoutTyp));
+        printk("Typical byte/word write timeout: %d µs\n", 1<<cfip->WordWriteTimeoutTyp);
+        printk("Maximum byte/word write timeout: %d µs\n", (1<<cfip->WordWriteTimeoutMax) * (1<<cfip->WordWriteTimeoutTyp));
 
         if (cfip->BufWriteTimeoutTyp || cfip->BufWriteTimeoutMax) {
-                printk("Typical full buffer write timeout: %d µs\n", 1<<cfip->BufWriteTimeoutTyp);
-                printk("Maximum full buffer write timeout: %d µs\n", (1<<cfip->BufWriteTimeoutMax) * (1<<cfip->BufWriteTimeoutTyp));
+                printk("Typical full buffer write timeout: %d µs\n", 1<<cfip->BufWriteTimeoutTyp);
+                printk("Maximum full buffer write timeout: %d µs\n", (1<<cfip->BufWriteTimeoutMax) * (1<<cfip->BufWriteTimeoutTyp));
         }
         else
                 printk("Full buffer write not supported\n");
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index 41bd59d20d85..cdb0f590b40c 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -37,8 +37,15 @@ struct mtd_info *mtd_do_chip_probe(struct map_info *map, struct chip_probe *cp)
         if (!mtd)
                 mtd = check_cmd_set(map, 0); /* Then the secondary */
 
-        if (mtd)
+        if (mtd) {
+                if (mtd->size > map->size) {
+                        printk(KERN_WARNING "Reducing visibility of %ldKiB chip to %ldKiB\n",
+                               (unsigned long)mtd->size >> 10, 
+                               (unsigned long)map->size >> 10);
+                        mtd->size = map->size;
+                }
                 return mtd;
+        }
 
         printk(KERN_WARNING"gen_probe: No supported Vendor Command Set found\n");
 
@@ -100,7 +107,12 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
          * Align bitmap storage size to full byte.
          */
         max_chips = map->size >> cfi.chipshift;
-        mapsize = (max_chips / 8) + ((max_chips % 8) ? 1 : 0);
+        if (!max_chips) {
+                printk(KERN_WARNING "NOR chip too large to fit in mapping. Attempting to cope...\n");
+                max_chips = 1;
+        }
+
+        mapsize = (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG;
         chip_map = kmalloc(mapsize, GFP_KERNEL);
         if (!chip_map) {
                 printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);
@@ -194,25 +206,28 @@ static inline struct mtd_info *cfi_cmdset_unknown(struct map_info *map,
 {
         struct cfi_private *cfi = map->fldrv_priv;
         __u16 type = primary?cfi->cfiq->P_ID:cfi->cfiq->A_ID;
-#if defined(CONFIG_MODULES) && defined(HAVE_INTER_MODULE)
-        char probename[32];
+#ifdef CONFIG_MODULES
+        char probename[16+sizeof(MODULE_SYMBOL_PREFIX)];
         cfi_cmdset_fn_t *probe_function;
 
-        sprintf(probename, "cfi_cmdset_%4.4X", type);
+        sprintf(probename, MODULE_SYMBOL_PREFIX "cfi_cmdset_%4.4X", type);
 
-        probe_function = inter_module_get_request(probename, probename);
+        probe_function = __symbol_get(probename);
+        if (!probe_function) {
+                request_module(probename + sizeof(MODULE_SYMBOL_PREFIX) - 1);
+                probe_function = __symbol_get(probename);
+        }
 
         if (probe_function) {
                 struct mtd_info *mtd;
 
                 mtd = (*probe_function)(map, primary);
                 /* If it was happy, it'll have increased its own use count */
-                inter_module_put(probename);
+                symbol_put_addr(probe_function);
                 return mtd;
         }
 #endif
-        printk(KERN_NOTICE "Support for command set %04X not present\n",
-               type);
+        printk(KERN_NOTICE "Support for command set %04X not present\n", type);
 
         return NULL;
 }
@@ -226,12 +241,8 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
                 return NULL;
 
         switch(type){
-                /* Urgh. Ifdefs. The version with weak symbols was
-                 * _much_ nicer. Shame it didn't seem to work on
-                 * anything but x86, really.
-                 * But we can't rely in inter_module_get() because
-                 * that'd mean we depend on link order.
-                 */
+                /* We need these for the !CONFIG_MODULES case,
+                   because symbol_get() doesn't work there */
 #ifdef CONFIG_MTD_CFI_INTELEXT
         case 0x0001:
         case 0x0003:
@@ -246,9 +257,9 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary)
         case 0x0020:
                 return cfi_cmdset_0020(map, primary);
 #endif
+        default:
+                return cfi_cmdset_unknown(map, primary);
         }
-
-        return cfi_cmdset_unknown(map, primary);
 }
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
index bd2e876a814b..763925747db6 100644
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
@@ -70,7 +70,7 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
         mtd->read = mapram_read;
         mtd->write = mapram_write;
         mtd->sync = mapram_nop;
-        mtd->flags = MTD_CAP_RAM | MTD_VOLATILE;
+        mtd->flags = MTD_CAP_RAM;
 
         mtd->erasesize = PAGE_SIZE;
         while(mtd->size & (mtd->erasesize - 1))
diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index 624c12c232c8..bc6ee9ef8a31 100644
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -46,9 +46,7 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
         mtd->write = maprom_write;
         mtd->sync = maprom_nop;
         mtd->flags = MTD_CAP_ROM;
-        mtd->erasesize = 131072;
-        while(mtd->size & (mtd->erasesize - 1))
-                mtd->erasesize >>= 1;
+        mtd->erasesize = map->size;
 
         __module_get(THIS_MODULE);
         return mtd;
diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c
index 3cc0b23c5865..967abbecdff9 100644
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
@@ -140,6 +140,7 @@ static struct mtd_info *sharp_probe(struct map_info *map)
         mtd->suspend = sharp_suspend;
         mtd->resume = sharp_resume;
         mtd->flags = MTD_CAP_NORFLASH;
+        mtd->writesize = 1;
         mtd->name = map->name;
 
         memset(sharp, 0, sizeof(*sharp));
diff --git a/drivers/mtd/devices/Kconfig b/drivers/mtd/devices/Kconfig
index 7fac438b5c32..16c02b5ccf7e 100644
--- a/drivers/mtd/devices/Kconfig
+++ b/drivers/mtd/devices/Kconfig
@@ -47,6 +47,11 @@ config MTD_MS02NV
           accelerator.  Say Y here if you have a DECstation 5000/2x0 or a
           DECsystem 5900 equipped with such a module.
 
+          If you want to compile this driver as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want),
+          say M here and read <file:Documentation/modules.txt>.  The module will
+          be called ms02-nv.o.
+
 config MTD_DATAFLASH
         tristate "Support for AT45xxx DataFlash"
         depends on MTD && SPI_MASTER && EXPERIMENTAL
@@ -209,7 +214,6 @@ config MTD_DOC2001PLUS
 config MTD_DOCPROBE
         tristate
         select MTD_DOCECC
-        select OBSOLETE_INTERMODULE
 
 config MTD_DOCECC
         tristate
diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile
index b6573670316f..0f788d5c4bf8 100644
--- a/drivers/mtd/devices/Makefile
+++ b/drivers/mtd/devices/Makefile
@@ -3,13 +3,6 @@
 #
 # $Id: Makefile.common,v 1.7 2004/12/22 17:51:15 joern Exp $
 
-#                       *** BIG UGLY NOTE ***
-#
-# The removal of get_module_symbol() and replacement with
-# inter_module_register() et al has introduced a link order dependency
-# here where previously there was none.  We now have to ensure that
-# doc200[01].o are linked before docprobe.o
-
 obj-$(CONFIG_MTD_DOC2000)       += doc2000.o
 obj-$(CONFIG_MTD_DOC2001)       += doc2001.o
 obj-$(CONFIG_MTD_DOC2001PLUS)   += doc2001plus.o
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 4160b8334c53..0d98c223c5fc 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -4,7 +4,7 @@
  * block2mtd.c - create an mtd from a block device
  *
  * Copyright (C) 2001,2002      Simon Evans <spse@secret.org.uk>
- * Copyright (C) 2004,2005      Jörn Engel <joern@wh.fh-wedel.de>
+ * Copyright (C) 2004-2006      Jörn Engel <joern@wh.fh-wedel.de>
  *
  * Licence: GPL
  */
@@ -331,7 +331,6 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
         dev->mtd.writev = default_mtd_writev;
         dev->mtd.sync = block2mtd_sync;
         dev->mtd.read = block2mtd_read;
-        dev->mtd.readv = default_mtd_readv;
         dev->mtd.priv = dev;
         dev->mtd.owner = THIS_MODULE;
 
@@ -351,6 +350,12 @@ devinit_err:
 }
 
 
+/* This function works similar to reguler strtoul.  In addition, it
+ * allows some suffixes for a more human-readable number format:
+ * ki, Ki, kiB, KiB     - multiply result with 1024
+ * Mi, MiB              - multiply result with 1024^2
+ * Gi, GiB              - multiply result with 1024^3
+ */
 static int ustrtoul(const char *cp, char **endp, unsigned int base)
 {
         unsigned long result = simple_strtoul(cp, endp, base);
@@ -359,11 +364,16 @@ static int ustrtoul(const char *cp, char **endp, unsigned int base)
                 result *= 1024;
         case 'M':
                 result *= 1024;
+        case 'K':
         case 'k':
                 result *= 1024;
         /* By dwmw2 editorial decree, "ki", "Mi" or "Gi" are to be used. */
-                if ((*endp)[1] == 'i')
-                        (*endp) += 2;
+                if ((*endp)[1] == 'i') {
+                        if ((*endp)[2] == 'B')
+                                (*endp) += 3;
+                        else
+                                (*endp) += 2;
+                }
         }
         return result;
 }
@@ -418,7 +428,8 @@ static inline void kill_final_newline(char *str)
 
 static int block2mtd_setup(const char *val, struct kernel_param *kp)
 {
-        char buf[80+12], *str=buf; /* 80 for device, 12 for erase size */
+        char buf[80+12]; /* 80 for device, 12 for erase size */
+        char *str = buf;
         char *token[2];
         char *name;
         size_t erase_size = PAGE_SIZE;
@@ -430,7 +441,7 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)
         strcpy(str, val);
         kill_final_newline(str);
 
-        for (i=0; i<2; i++)
+        for (i = 0; i < 2; i++)
                 token[i] = strsep(&str, ",");
 
         if (str)
@@ -449,8 +460,10 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)
 
         if (token[1]) {
                 ret = parse_num(&erase_size, token[1]);
-                if (ret)
+                if (ret) {
+                        kfree(name);
                         parse_err("illegal erase size");
+                }
         }
 
         add_device(name, erase_size);
diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
index 23e7a5c7d2c1..c54e40464d82 100644
--- a/drivers/mtd/devices/doc2000.c
+++ b/drivers/mtd/devices/doc2000.c
@@ -59,13 +59,10 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);
 static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                          size_t *retlen, const u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel);
-static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
-                          unsigned long count, loff_t to, size_t *retlen,
-                          u_char *eccbuf, struct nand_oobinfo *oobsel);
-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                        size_t *retlen, u_char *buf);
-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                         size_t *retlen, const u_char *buf);
+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,
+                        struct mtd_oob_ops *ops);
+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,
+                         struct mtd_oob_ops *ops);
 static int doc_write_oob_nolock(struct mtd_info *mtd, loff_t ofs, size_t len,
                          size_t *retlen, const u_char *buf);
 static int doc_erase (struct mtd_info *mtd, struct erase_info *instr);
@@ -517,16 +514,9 @@ static int DoC2k_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)
         return retval;
 }
 
-static const char im_name[] = "DoC2k_init";
-
-/* This routine is made available to other mtd code via
- * inter_module_register.  It must only be accessed through
- * inter_module_get which will bump the use count of this module.  The
- * addresses passed back in mtd are valid as long as the use count of
- * this module is non-zero, i.e. between inter_module_get and
- * inter_module_put.  Keith Owens <kaos@ocs.com.au> 29 Oct 2000.
- */
-static void DoC2k_init(struct mtd_info *mtd)
+/* This routine is found from the docprobe code by symbol_get(),
+ * which will bump the use count of this module. */
+void DoC2k_init(struct mtd_info *mtd)
 {
         struct DiskOnChip *this = mtd->priv;
         struct DiskOnChip *old = NULL;
@@ -586,7 +576,7 @@ static void DoC2k_init(struct mtd_info *mtd)
         mtd->ecctype = MTD_ECC_RS_DiskOnChip;
         mtd->size = 0;
         mtd->erasesize = 0;
-        mtd->oobblock = 512;
+        mtd->writesize = 512;
         mtd->oobsize = 16;
         mtd->owner = THIS_MODULE;
         mtd->erase = doc_erase;
@@ -594,9 +584,6 @@ static void DoC2k_init(struct mtd_info *mtd)
         mtd->unpoint = NULL;
         mtd->read = doc_read;
         mtd->write = doc_write;
-        mtd->read_ecc = doc_read_ecc;
-        mtd->write_ecc = doc_write_ecc;
-        mtd->writev_ecc = doc_writev_ecc;
         mtd->read_oob = doc_read_oob;
         mtd->write_oob = doc_write_oob;
         mtd->sync = NULL;
@@ -623,6 +610,7 @@ static void DoC2k_init(struct mtd_info *mtd)
                 return;
         }
 }
+EXPORT_SYMBOL_GPL(DoC2k_init);
 
 static int doc_read(struct mtd_info *mtd, loff_t from, size_t len,
                     size_t * retlen, u_char * buf)
@@ -971,72 +959,18 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
         return 0;
 }
 
-static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
-                          unsigned long count, loff_t to, size_t *retlen,
-                          u_char *eccbuf, struct nand_oobinfo *oobsel)
-{
-        static char static_buf[512];
-        static DEFINE_MUTEX(writev_buf_mutex);
-
-        size_t totretlen = 0;
-        size_t thisvecofs = 0;
-        int ret= 0;
-
-        mutex_lock(&writev_buf_mutex);
-
-        while(count) {
-                size_t thislen, thisretlen;
-                unsigned char *buf;
-
-                buf = vecs->iov_base + thisvecofs;
-                thislen = vecs->iov_len - thisvecofs;
-
-
-                if (thislen >= 512) {
-                        thislen = thislen & ~(512-1);
-                        thisvecofs += thislen;
-                } else {
-                        /* Not enough to fill a page. Copy into buf */
-                        memcpy(static_buf, buf, thislen);
-                        buf = &static_buf[thislen];
-
-                        while(count && thislen < 512) {
-                                vecs++;
-                                count--;
-                                thisvecofs = min((512-thislen), vecs->iov_len);
-                                memcpy(buf, vecs->iov_base, thisvecofs);
-                                thislen += thisvecofs;
-                                buf += thisvecofs;
-                        }
-                        buf = static_buf;
-                }
-                if (count && thisvecofs == vecs->iov_len) {
-                        thisvecofs = 0;
-                        vecs++;
-                        count--;
-                }
-                ret = doc_write_ecc(mtd, to, thislen, &thisretlen, buf, eccbuf, oobsel);
-
-                totretlen += thisretlen;
-
-                if (ret || thisretlen != thislen)
-                        break;
-
-                to += thislen;
-        }
-
-        mutex_unlock(&writev_buf_mutex);
-        *retlen = totretlen;
-        return ret;
-}
-
-
-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                        size_t * retlen, u_char * buf)
+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,
+                        struct mtd_oob_ops *ops)
 {
         struct DiskOnChip *this = mtd->priv;
         int len256 = 0, ret;
         struct Nand *mychip;
+        uint8_t *buf = ops->oobbuf;
+        size_t len = ops->len;
+
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
+
+        ofs += ops->ooboffs;
 
         mutex_lock(&this->lock);
 
@@ -1077,7 +1011,7 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
 
         DoC_ReadBuf(this, &buf[len256], len - len256);
 
-        *retlen = len;
+        ops->retlen = len;
         /* Reading the full OOB data drops us off of the end of the page,
          * causing the flash device to go into busy mode, so we need
          * to wait until ready 11.4.1 and Toshiba TC58256FT docs */
@@ -1192,17 +1126,20 @@ static int doc_write_oob_nolock(struct mtd_info *mtd, loff_t ofs, size_t len,
 
 }
 
-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                         size_t * retlen, const u_char * buf)
+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,
+                         struct mtd_oob_ops *ops)
 {
-        struct DiskOnChip *this = mtd->priv;
-        int ret;
+        struct DiskOnChip *this = mtd->priv;
+        int ret;
 
-        mutex_lock(&this->lock);
-        ret = doc_write_oob_nolock(mtd, ofs, len, retlen, buf);
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
+
+        mutex_lock(&this->lock);
+        ret = doc_write_oob_nolock(mtd, ofs + ops->ooboffs, ops->len,
+                                   &ops->retlen, ops->oobbuf);
 
-        mutex_unlock(&this->lock);
-        return ret;
+        mutex_unlock(&this->lock);
+        return ret;
 }
 
 static int doc_erase(struct mtd_info *mtd, struct erase_info *instr)
@@ -1277,12 +1214,6 @@ static int doc_erase(struct mtd_info *mtd, struct erase_info *instr)
  *
  ****************************************************************************/
 
-static int __init init_doc2000(void)
-{
-       inter_module_register(im_name, THIS_MODULE, &DoC2k_init);
-       return 0;
-}
-
 static void __exit cleanup_doc2000(void)
 {
         struct mtd_info *mtd;
@@ -1298,11 +1229,9 @@ static void __exit cleanup_doc2000(void)
                 kfree(this->chips);
                 kfree(mtd);
         }
-        inter_module_unregister(im_name);
 }
 
 module_exit(cleanup_doc2000);
-module_init(init_doc2000);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org> et al.");
diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
index 681a9c73a2a3..0cf022a69e65 100644
--- a/drivers/mtd/devices/doc2001.c
+++ b/drivers/mtd/devices/doc2001.c
@@ -43,10 +43,10 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
 static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                          size_t *retlen, const u_char *buf, u_char *eccbuf,
                          struct nand_oobinfo *oobsel);
-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                        size_t *retlen, u_char *buf);
-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                         size_t *retlen, const u_char *buf);
+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,
+                        struct mtd_oob_ops *ops);
+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,
+                         struct mtd_oob_ops *ops);
 static int doc_erase (struct mtd_info *mtd, struct erase_info *instr);
 
 static struct mtd_info *docmillist = NULL;
@@ -324,16 +324,9 @@ static int DoCMil_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)
         return retval;
 }
 
-static const char im_name[] = "DoCMil_init";
-
-/* This routine is made available to other mtd code via
- * inter_module_register.  It must only be accessed through
- * inter_module_get which will bump the use count of this module.  The
- * addresses passed back in mtd are valid as long as the use count of
- * this module is non-zero, i.e. between inter_module_get and
- * inter_module_put.  Keith Owens <kaos@ocs.com.au> 29 Oct 2000.
- */
-static void DoCMil_init(struct mtd_info *mtd)
+/* This routine is found from the docprobe code by symbol_get(),
+ * which will bump the use count of this module. */
+void DoCMil_init(struct mtd_info *mtd)
 {
         struct DiskOnChip *this = mtd->priv;
         struct DiskOnChip *old = NULL;
@@ -368,7 +361,7 @@ static void DoCMil_init(struct mtd_info *mtd)
         /* FIXME: erase size is not always 8KiB */
         mtd->erasesize = 0x2000;
 
-        mtd->oobblock = 512;
+        mtd->writesize = 512;
         mtd->oobsize = 16;
         mtd->owner = THIS_MODULE;
         mtd->erase = doc_erase;
@@ -376,8 +369,6 @@ static void DoCMil_init(struct mtd_info *mtd)
         mtd->unpoint = NULL;
         mtd->read = doc_read;
         mtd->write = doc_write;
-        mtd->read_ecc = doc_read_ecc;
-        mtd->write_ecc = doc_write_ecc;
         mtd->read_oob = doc_read_oob;
         mtd->write_oob = doc_write_oob;
         mtd->sync = NULL;
@@ -401,6 +392,7 @@ static void DoCMil_init(struct mtd_info *mtd)
                 return;
         }
 }
+EXPORT_SYMBOL_GPL(DoCMil_init);
 
 static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
                      size_t *retlen, u_char *buf)
@@ -670,8 +662,8 @@ static int doc_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
         return ret;
 }
 
-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                        size_t *retlen, u_char *buf)
+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,
+                        struct mtd_oob_ops *ops)
 {
 #ifndef USE_MEMCPY
         int i;
@@ -680,6 +672,12 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
         struct DiskOnChip *this = mtd->priv;
         void __iomem *docptr = this->virtadr;
         struct Nand *mychip = &this->chips[ofs >> this->chipshift];
+        uint8_t *buf = ops->oobbuf;
+        size_t len = ops->len;
+
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
+
+        ofs += ops->ooboffs;
 
         /* Find the chip which is to be used and select it */
         if (this->curfloor != mychip->floor) {
@@ -716,13 +714,13 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
 #endif
         buf[len - 1] = ReadDOC(docptr, LastDataRead);
 
-        *retlen = len;
+        ops->retlen = len;
 
         return 0;
 }
 
-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                         size_t *retlen, const u_char *buf)
+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,
+                         struct mtd_oob_ops *ops)
 {
 #ifndef USE_MEMCPY
         int i;
@@ -732,6 +730,12 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
         struct DiskOnChip *this = mtd->priv;
         void __iomem *docptr = this->virtadr;
         struct Nand *mychip = &this->chips[ofs >> this->chipshift];
+        uint8_t *buf = ops->oobbuf;
+        size_t len = ops->len;
+
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
+
+        ofs += ops->ooboffs;
 
         /* Find the chip which is to be used and select it */
         if (this->curfloor != mychip->floor) {
@@ -783,12 +787,12 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
         if (ReadDOC(docptr, Mil_CDSN_IO) & 1) {
                 printk("Error programming oob data\n");
                 /* FIXME: implement Bad Block Replacement (in nftl.c ??) */
-                *retlen = 0;
+                ops->retlen = 0;
                 ret = -EIO;
         }
         dummy = ReadDOC(docptr, LastDataRead);
 
-        *retlen = len;
+        ops->retlen = len;
 
         return ret;
 }
@@ -856,12 +860,6 @@ int doc_erase (struct mtd_info *mtd, struct erase_info *instr)
  *
  ****************************************************************************/
 
-static int __init init_doc2001(void)
-{
-        inter_module_register(im_name, THIS_MODULE, &DoCMil_init);
-        return 0;
-}
-
 static void __exit cleanup_doc2001(void)
 {
         struct mtd_info *mtd;
@@ -877,11 +875,9 @@ static void __exit cleanup_doc2001(void)
                 kfree(this->chips);
                 kfree(mtd);
         }
-        inter_module_unregister(im_name);
 }
 
 module_exit(cleanup_doc2001);
-module_init(init_doc2001);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org> et al.");
diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 5f57f29efee4..66cb1e50469a 100644
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -47,10 +47,10 @@ static int doc_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
 static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                 size_t *retlen, const u_char *buf, u_char *eccbuf,
                 struct nand_oobinfo *oobsel);
-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                size_t *retlen, u_char *buf);
-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                size_t *retlen, const u_char *buf);
+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,
+                        struct mtd_oob_ops *ops);
+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,
+                         struct mtd_oob_ops *ops);
 static int doc_erase (struct mtd_info *mtd, struct erase_info *instr);
 
 static struct mtd_info *docmilpluslist = NULL;
@@ -447,16 +447,9 @@ static int DoCMilPlus_is_alias(struct DiskOnChip *doc1, struct DiskOnChip *doc2)
         return retval;
 }
 
-static const char im_name[] = "DoCMilPlus_init";
-
-/* This routine is made available to other mtd code via
- * inter_module_register.  It must only be accessed through
- * inter_module_get which will bump the use count of this module.  The
- * addresses passed back in mtd are valid as long as the use count of
- * this module is non-zero, i.e. between inter_module_get and
- * inter_module_put.  Keith Owens <kaos@ocs.com.au> 29 Oct 2000.
- */
-static void DoCMilPlus_init(struct mtd_info *mtd)
+/* This routine is found from the docprobe code by symbol_get(),
+ * which will bump the use count of this module. */
+void DoCMilPlus_init(struct mtd_info *mtd)
 {
         struct DiskOnChip *this = mtd->priv;
         struct DiskOnChip *old = NULL;
@@ -490,7 +483,7 @@ static void DoCMilPlus_init(struct mtd_info *mtd)
         mtd->size = 0;
 
         mtd->erasesize = 0;
-        mtd->oobblock = 512;
+        mtd->writesize = 512;
         mtd->oobsize = 16;
         mtd->owner = THIS_MODULE;
         mtd->erase = doc_erase;
@@ -498,8 +491,6 @@ static void DoCMilPlus_init(struct mtd_info *mtd)
         mtd->unpoint = NULL;
         mtd->read = doc_read;
         mtd->write = doc_write;
-        mtd->read_ecc = doc_read_ecc;
-        mtd->write_ecc = doc_write_ecc;
         mtd->read_oob = doc_read_oob;
         mtd->write_oob = doc_write_oob;
         mtd->sync = NULL;
@@ -524,6 +515,7 @@ static void DoCMilPlus_init(struct mtd_info *mtd)
                 return;
         }
 }
+EXPORT_SYMBOL_GPL(DoCMilPlus_init);
 
 #if 0
 static int doc_dumpblk(struct mtd_info *mtd, loff_t from)
@@ -876,14 +868,20 @@ static int doc_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
         return ret;
 }
 
-static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                        size_t *retlen, u_char *buf)
+static int doc_read_oob(struct mtd_info *mtd, loff_t ofs,
+                        struct mtd_oob_ops *ops)
 {
         loff_t fofs, base;
         struct DiskOnChip *this = mtd->priv;
         void __iomem * docptr = this->virtadr;
         struct Nand *mychip = &this->chips[ofs >> this->chipshift];
         size_t i, size, got, want;
+        uint8_t *buf = ops->oobbuf;
+        size_t len = ops->len;
+
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
+
+        ofs += ops->ooboffs;
 
         DoC_CheckASIC(docptr);
 
@@ -949,12 +947,12 @@ static int doc_read_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
         /* Disable flash internally */
         WriteDOC(0, docptr, Mplus_FlashSelect);
 
-        *retlen = len;
+        ops->retlen = len;
         return 0;
 }
 
-static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
-                         size_t *retlen, const u_char *buf)
+static int doc_write_oob(struct mtd_info *mtd, loff_t ofs,
+                         struct mtd_oob_ops *ops)
 {
         volatile char dummy;
         loff_t fofs, base;
@@ -963,6 +961,12 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
         struct Nand *mychip = &this->chips[ofs >> this->chipshift];
         size_t i, size, got, want;
         int ret = 0;
+        uint8_t *buf = ops->oobbuf;
+        size_t len = ops->len;
+
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
+
+        ofs += ops->ooboffs;
 
         DoC_CheckASIC(docptr);
 
@@ -1038,7 +1042,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
                         printk("MTD: Error 0x%x programming oob at 0x%x\n",
                                 dummy, (int)ofs);
                         /* FIXME: implement Bad Block Replacement */
-                        *retlen = 0;
+                        ops->retlen = 0;
                         ret = -EIO;
                 }
                 dummy = ReadDOC(docptr, Mplus_LastDataRead);
@@ -1051,7 +1055,7 @@ static int doc_write_oob(struct mtd_info *mtd, loff_t ofs, size_t len,
         /* Disable flash internally */
         WriteDOC(0, docptr, Mplus_FlashSelect);
 
-        *retlen = len;
+        ops->retlen = len;
         return ret;
 }
 
@@ -1122,12 +1126,6 @@ int doc_erase(struct mtd_info *mtd, struct erase_info *instr)
  *
  ****************************************************************************/
 
-static int __init init_doc2001plus(void)
-{
-        inter_module_register(im_name, THIS_MODULE, &DoCMilPlus_init);
-        return 0;
-}
-
 static void __exit cleanup_doc2001plus(void)
 {
         struct mtd_info *mtd;
@@ -1143,11 +1141,9 @@ static void __exit cleanup_doc2001plus(void)
                 kfree(this->chips);
                 kfree(mtd);
         }
-        inter_module_unregister(im_name);
 }
 
 module_exit(cleanup_doc2001plus);
-module_init(init_doc2001plus);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Greg Ungerer <gerg@snapgear.com> et al.");
diff --git a/drivers/mtd/devices/docprobe.c b/drivers/mtd/devices/docprobe.c
index 13178b9dd00a..593bb033a3fa 100644
--- a/drivers/mtd/devices/docprobe.c
+++ b/drivers/mtd/devices/docprobe.c
@@ -231,6 +231,10 @@ static inline int __init doccheck(void __iomem *potential, unsigned long physadr
 
 static int docfound;
 
+extern void DoC2k_init(struct mtd_info *);
+extern void DoCMil_init(struct mtd_info *);
+extern void DoCMilPlus_init(struct mtd_info *);
+
 static void __init DoC_Probe(unsigned long physadr)
 {
         void __iomem *docptr;
@@ -239,8 +243,6 @@ static void __init DoC_Probe(unsigned long physadr)
         int ChipID;
         char namebuf[15];
         char *name = namebuf;
-        char *im_funcname = NULL;
-        char *im_modname = NULL;
         void (*initroutine)(struct mtd_info *) = NULL;
 
         docptr = ioremap(physadr, DOC_IOREMAP_LEN);
@@ -278,41 +280,33 @@ static void __init DoC_Probe(unsigned long physadr)
                 switch(ChipID) {
                 case DOC_ChipID_Doc2kTSOP:
                         name="2000 TSOP";
-                        im_funcname = "DoC2k_init";
-                        im_modname = "doc2000";
+                        initroutine = symbol_request(DoC2k_init);
                         break;
 
                 case DOC_ChipID_Doc2k:
                         name="2000";
-                        im_funcname = "DoC2k_init";
-                        im_modname = "doc2000";
+                        initroutine = symbol_request(DoC2k_init);
                         break;
 
                 case DOC_ChipID_DocMil:
                         name="Millennium";
 #ifdef DOC_SINGLE_DRIVER
-                        im_funcname = "DoC2k_init";
-                        im_modname = "doc2000";
+                        initroutine = symbol_request(DoC2k_init);
 #else
-                        im_funcname = "DoCMil_init";
-                        im_modname = "doc2001";
+                        initroutine = symbol_request(DoCMil_init);
 #endif /* DOC_SINGLE_DRIVER */
                         break;
 
                 case DOC_ChipID_DocMilPlus16:
                 case DOC_ChipID_DocMilPlus32:
                         name="MillenniumPlus";
-                        im_funcname = "DoCMilPlus_init";
-                        im_modname = "doc2001plus";
+                        initroutine = symbol_request(DoCMilPlus_init);
                         break;
                 }
 
-                if (im_funcname)
-                        initroutine = inter_module_get_request(im_funcname, im_modname);
-
                 if (initroutine) {
                         (*initroutine)(mtd);
-                        inter_module_put(im_funcname);
+                        symbol_put_addr(initroutine);
                         return;
                 }
                 printk(KERN_NOTICE "Cannot find driver for DiskOnChip %s at 0x%lX\n", name, physadr);
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index 29b0ddaa324e..4ea50a1dda85 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -635,6 +635,7 @@ int __init lart_flash_init (void)
    printk ("%s: This looks like a LART board to me.\n",module_name);
    mtd.name = module_name;
    mtd.type = MTD_NORFLASH;
+   mtd.writesize = 1;
    mtd.flags = MTD_CAP_NORFLASH;
    mtd.size = FLASH_BLOCKSIZE_PARAM * FLASH_NUMBLOCKS_16m_PARAM + FLASH_BLOCKSIZE_MAIN * FLASH_NUMBLOCKS_16m_MAIN;
    mtd.erasesize = FLASH_BLOCKSIZE_MAIN;
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 04e65d5dae00..a8466141e914 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -465,6 +465,7 @@ static int __devinit m25p_probe(struct spi_device *spi)
                 flash->mtd.name = spi->dev.bus_id;
 
         flash->mtd.type = MTD_NORFLASH;
+        flash->mtd.writesize = 1;
         flash->mtd.flags = MTD_CAP_NORFLASH;
         flash->mtd.size = info->sector_size * info->n_sectors;
         flash->mtd.erasesize = info->sector_size;
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
index 485f663493d2..4ab7670770e4 100644
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
@@ -219,7 +219,7 @@ static int __init ms02nv_init_one(ulong addr)
         mp->uaddr = phys_to_virt(fixaddr);
 
         mtd->type = MTD_RAM;
-        mtd->flags = MTD_CAP_RAM | MTD_XIP;
+        mtd->flags = MTD_CAP_RAM;
         mtd->size = fixsize;
         mtd->name = (char *)ms02nv_name;
         mtd->owner = THIS_MODULE;
diff --git a/drivers/mtd/devices/mtdram.c b/drivers/mtd/devices/mtdram.c
index 1443117fd8f4..b4438eacfd80 100644
--- a/drivers/mtd/devices/mtdram.c
+++ b/drivers/mtd/devices/mtdram.c
@@ -106,6 +106,7 @@ int mtdram_init_device(struct mtd_info *mtd, void *mapped_address,
         mtd->type = MTD_RAM;
         mtd->flags = MTD_CAP_RAM;
         mtd->size = size;
+        mtd->writesize = 1;
         mtd->erasesize = MTDRAM_ERASE_SIZE;
         mtd->priv = mapped_address;
 
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index e8685ee6c1e4..e09e416667d3 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -1,8 +1,8 @@
 /**
  * $Id: phram.c,v 1.16 2005/11/07 11:14:25 gleixner Exp $
  *
- * Copyright (c) ????           Jochen Schäuble <psionic@psionic.de>
- * Copyright (c) 2003-2004      Jörn Engel <joern@wh.fh-wedel.de>
+ * Copyright (c) ????           Jochen Schäuble <psionic@psionic.de>
+ * Copyright (c) 2003-2004      Jörn Engel <joern@wh.fh-wedel.de>
  *
  * Usage:
  *
@@ -142,7 +142,7 @@ static int register_device(char *name, unsigned long start, unsigned long len)
 
         new->mtd.name = name;
         new->mtd.size = len;
-        new->mtd.flags = MTD_CAP_RAM | MTD_ERASEABLE | MTD_VOLATILE;
+        new->mtd.flags = MTD_CAP_RAM;
         new->mtd.erase = phram_erase;
         new->mtd.point = phram_point;
         new->mtd.unpoint = phram_unpoint;
@@ -266,12 +266,16 @@ static int phram_setup(const char *val, struct kernel_param *kp)
                 return 0;
 
         ret = parse_num32(&start, token[1]);
-        if (ret)
+        if (ret) {
+                kfree(name);
                 parse_err("illegal start address\n");
+        }
 
         ret = parse_num32(&len, token[2]);
-        if (ret)
+        if (ret) {
+                kfree(name);
                 parse_err("illegal device length\n");
+        }
 
         register_device(name, start, len);
 
@@ -296,5 +300,5 @@ module_init(init_phram);
 module_exit(cleanup_phram);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Jörn Engel <joern@wh.fh-wedel.de>");
+MODULE_AUTHOR("Jörn Engel <joern@wh.fh-wedel.de>");
 MODULE_DESCRIPTION("MTD driver for physical RAM");
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 6faee6c6958c..b3f665e3c38b 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -200,8 +200,7 @@ static int register_device(char *name, unsigned long start, unsigned long length
 
         (*curmtd)->mtdinfo->name = name;
         (*curmtd)->mtdinfo->size = length;
-        (*curmtd)->mtdinfo->flags = MTD_CLEAR_BITS | MTD_SET_BITS |
-                                        MTD_WRITEB_WRITEABLE | MTD_VOLATILE | MTD_CAP_RAM;
+        (*curmtd)->mtdinfo->flags = MTD_CAP_RAM;
         (*curmtd)->mtdinfo->erase = slram_erase;
         (*curmtd)->mtdinfo->point = slram_point;
         (*curmtd)->mtdinfo->unpoint = slram_unpoint;
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index a3b92479719d..1e21a2c3dd29 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -36,6 +36,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/inftl.h>
+#include <linux/mtd/nand.h>
 #include <asm/uaccess.h>
 #include <asm/errno.h>
 #include <asm/io.h>
@@ -79,14 +80,12 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         inftl->mbd.devnum = -1;
         inftl->mbd.blksize = 512;
         inftl->mbd.tr = tr;
-        memcpy(&inftl->oobinfo, &mtd->oobinfo, sizeof(struct nand_oobinfo));
-        inftl->oobinfo.useecc = MTD_NANDECC_PLACEONLY;
 
-        if (INFTL_mount(inftl) < 0) {
+        if (INFTL_mount(inftl) < 0) {
                 printk(KERN_WARNING "INFTL: could not mount device\n");
                 kfree(inftl);
                 return;
-        }
+        }
 
         /* OK, it's a new one. Set up all the data structures. */
 
@@ -152,6 +151,69 @@ static void inftl_remove_dev(struct mtd_blktrans_dev *dev)
  */
 
 /*
+ * Read oob data from flash
+ */
+int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                   size_t *retlen, uint8_t *buf)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs & (mtd->writesize - 1);
+        ops.ooblen = len;
+        ops.oobbuf = buf;
+        ops.datbuf = NULL;
+        ops.len = len;
+
+        res = mtd->read_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
+/*
+ * Write oob data to flash
+ */
+int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                    size_t *retlen, uint8_t *buf)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs & (mtd->writesize - 1);
+        ops.ooblen = len;
+        ops.oobbuf = buf;
+        ops.datbuf = NULL;
+        ops.len = len;
+
+        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
+/*
+ * Write data and oob to flash
+ */
+static int inftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
+                       size_t *retlen, uint8_t *buf, uint8_t *oob)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs;
+        ops.ooblen = mtd->oobsize;
+        ops.oobbuf = oob;
+        ops.datbuf = buf;
+        ops.len = len;
+
+        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
+/*
  * INFTL_findfreeblock: Find a free Erase Unit on the INFTL partition.
  *      This function is used when the give Virtual Unit Chain.
  */
@@ -198,10 +260,11 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
         u16 BlockMap[MAX_SECTORS_PER_UNIT];
         unsigned char BlockDeleted[MAX_SECTORS_PER_UNIT];
         unsigned int thisEUN, prevEUN, status;
+        struct mtd_info *mtd = inftl->mbd.mtd;
         int block, silly;
         unsigned int targetEUN;
         struct inftl_oob oob;
-        size_t retlen;
+        size_t retlen;
 
         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
                 "pending=%d)\n", inftl, thisVUC, pendingblock);
@@ -221,18 +284,18 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
          * Scan to find the Erase Unit which holds the actual data for each
          * 512-byte block within the Chain.
          */
-        silly = MAX_LOOPS;
+        silly = MAX_LOOPS;
         while (thisEUN < inftl->nb_blocks) {
                 for (block = 0; block < inftl->EraseSize/SECTORSIZE; block ++) {
                         if ((BlockMap[block] != 0xffff) || BlockDeleted[block])
                                 continue;
 
-                        if (MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize)
-                             + (block * SECTORSIZE), 16 , &retlen,
-                             (char *)&oob) < 0)
+                        if (inftl_read_oob(mtd, (thisEUN * inftl->EraseSize)
+                                           + (block * SECTORSIZE), 16, &retlen,
+                                           (char *)&oob) < 0)
                                 status = SECTOR_IGNORE;
                         else
-                                status = oob.b.Status | oob.b.Status1;
+                                status = oob.b.Status | oob.b.Status1;
 
                         switch(status) {
                         case SECTOR_FREE:
@@ -282,29 +345,31 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                         continue;
                 }
 
-                /*
+                /*
                  * Copy only in non free block (free blocks can only
                  * happen in case of media errors or deleted blocks).
                  */
-                if (BlockMap[block] == BLOCK_NIL)
-                        continue;
-
-                ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
-                        BlockMap[block]) + (block * SECTORSIZE), SECTORSIZE,
-                        &retlen, movebuf);
-                if (ret < 0) {
-                        ret = MTD_READ(inftl->mbd.mtd, (inftl->EraseSize *
-                                BlockMap[block]) + (block * SECTORSIZE),
-                                SECTORSIZE, &retlen, movebuf);
+                if (BlockMap[block] == BLOCK_NIL)
+                        continue;
+
+                ret = mtd->read(mtd, (inftl->EraseSize * BlockMap[block]) +
+                                (block * SECTORSIZE), SECTORSIZE, &retlen,
+                                movebuf);
+                if (ret < 0 && ret != -EUCLEAN) {
+                        ret = mtd->read(mtd,
+                                        (inftl->EraseSize * BlockMap[block]) +
+                                        (block * SECTORSIZE), SECTORSIZE,
+                                        &retlen, movebuf);
                         if (ret != -EIO)
-                                DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "
-                                        "away on retry?\n");
-                }
-                memset(&oob, 0xff, sizeof(struct inftl_oob));
-                oob.b.Status = oob.b.Status1 = SECTOR_USED;
-                MTD_WRITEECC(inftl->mbd.mtd, (inftl->EraseSize * targetEUN) +
-                        (block * SECTORSIZE), SECTORSIZE, &retlen,
-                        movebuf, (char *)&oob, &inftl->oobinfo);
+                                DEBUG(MTD_DEBUG_LEVEL1, "INFTL: error went "
+                                      "away on retry?\n");
+                }
+                memset(&oob, 0xff, sizeof(struct inftl_oob));
+                oob.b.Status = oob.b.Status1 = SECTOR_USED;
+
+                inftl_write(inftl->mbd.mtd, (inftl->EraseSize * targetEUN) +
+                            (block * SECTORSIZE), SECTORSIZE, &retlen,
+                            movebuf, (char *)&oob);
         }
 
         /*
@@ -329,17 +394,17 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
                 if (thisEUN == targetEUN)
                         break;
 
-                if (INFTL_formatblock(inftl, thisEUN) < 0) {
+                if (INFTL_formatblock(inftl, thisEUN) < 0) {
                         /*
                          * Could not erase : mark block as reserved.
                          */
                         inftl->PUtable[thisEUN] = BLOCK_RESERVED;
-                } else {
+                } else {
                         /* Correctly erased : mark it as free */
                         inftl->PUtable[thisEUN] = BLOCK_FREE;
                         inftl->PUtable[prevEUN] = BLOCK_NIL;
                         inftl->numfreeEUNs++;
-                }
+                }
         }
 
         return targetEUN;
@@ -415,6 +480,7 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)
         unsigned int thisVUC = block / (inftl->EraseSize / SECTORSIZE);
         unsigned int thisEUN, writeEUN, prev_block, status;
         unsigned long blockofs = (block * SECTORSIZE) & (inftl->EraseSize -1);
+        struct mtd_info *mtd = inftl->mbd.mtd;
         struct inftl_oob oob;
         struct inftl_bci bci;
         unsigned char anac, nacs, parity;
@@ -434,10 +500,10 @@ static inline u16 INFTL_findwriteunit(struct INFTLrecord *inftl, unsigned block)
                 silly = MAX_LOOPS;
 
                 while (thisEUN <= inftl->lastEUN) {
-                        MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize) +
-                                blockofs, 8, &retlen, (char *)&bci);
+                        inftl_read_oob(mtd, (thisEUN * inftl->EraseSize) +
+                                       blockofs, 8, &retlen, (char *)&bci);
 
-                        status = bci.Status | bci.Status1;
+                        status = bci.Status | bci.Status1;
                         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: status of block %d in "
                                 "EUN %d is %x\n", block , writeEUN, status);
 
@@ -522,8 +588,8 @@ hitused:
                 nacs = 0;
                 thisEUN = inftl->VUtable[thisVUC];
                 if (thisEUN != BLOCK_NIL) {
-                        MTD_READOOB(inftl->mbd.mtd, thisEUN * inftl->EraseSize
-                                + 8, 8, &retlen, (char *)&oob.u);
+                        inftl_read_oob(mtd, thisEUN * inftl->EraseSize
+                                       + 8, 8, &retlen, (char *)&oob.u);
                         anac = oob.u.a.ANAC + 1;
                         nacs = oob.u.a.NACs + 1;
                 }
@@ -544,8 +610,8 @@ hitused:
                 oob.u.a.parityPerField = parity;
                 oob.u.a.discarded = 0xaa;
 
-                MTD_WRITEOOB(inftl->mbd.mtd, writeEUN * inftl->EraseSize + 8, 8,
-                        &retlen, (char *)&oob.u);
+                inftl_write_oob(mtd, writeEUN * inftl->EraseSize + 8, 8,
+                                &retlen, (char *)&oob.u);
 
                 /* Also back up header... */
                 oob.u.b.virtualUnitNo = cpu_to_le16(thisVUC);
@@ -555,8 +621,8 @@ hitused:
                 oob.u.b.parityPerField = parity;
                 oob.u.b.discarded = 0xaa;
 
-                MTD_WRITEOOB(inftl->mbd.mtd, writeEUN * inftl->EraseSize +
-                        SECTORSIZE * 4 + 8, 8, &retlen, (char *)&oob.u);
+                inftl_write_oob(mtd, writeEUN * inftl->EraseSize +
+                                SECTORSIZE * 4 + 8, 8, &retlen, (char *)&oob.u);
 
                 inftl->PUtable[writeEUN] = inftl->VUtable[thisVUC];
                 inftl->VUtable[thisVUC] = writeEUN;
@@ -576,6 +642,7 @@ hitused:
  */
 static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
 {
+        struct mtd_info *mtd = inftl->mbd.mtd;
         unsigned char BlockUsed[MAX_SECTORS_PER_UNIT];
         unsigned char BlockDeleted[MAX_SECTORS_PER_UNIT];
         unsigned int thisEUN, status;
@@ -606,9 +673,9 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
                         if (BlockUsed[block] || BlockDeleted[block])
                                 continue;
 
-                        if (MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize)
-                            + (block * SECTORSIZE), 8 , &retlen,
-                            (char *)&bci) < 0)
+                        if (inftl_read_oob(mtd, (thisEUN * inftl->EraseSize)
+                                           + (block * SECTORSIZE), 8 , &retlen,
+                                          (char *)&bci) < 0)
                                 status = SECTOR_IGNORE;
                         else
                                 status = bci.Status | bci.Status1;
@@ -670,12 +737,12 @@ static void INFTL_trydeletechain(struct INFTLrecord *inftl, unsigned thisVUC)
                 DEBUG(MTD_DEBUG_LEVEL3, "Deleting EUN %d from VUC %d\n",
                       thisEUN, thisVUC);
 
-                if (INFTL_formatblock(inftl, thisEUN) < 0) {
+                if (INFTL_formatblock(inftl, thisEUN) < 0) {
                         /*
                          * Could not erase : mark block as reserved.
                          */
                         inftl->PUtable[thisEUN] = BLOCK_RESERVED;
-                } else {
+                } else {
                         /* Correctly erased : mark it as free */
                         inftl->PUtable[thisEUN] = BLOCK_FREE;
                         inftl->numfreeEUNs++;
@@ -697,6 +764,7 @@ static int INFTL_deleteblock(struct INFTLrecord *inftl, unsigned block)
 {
         unsigned int thisEUN = inftl->VUtable[block / (inftl->EraseSize / SECTORSIZE)];
         unsigned long blockofs = (block * SECTORSIZE) & (inftl->EraseSize - 1);
+        struct mtd_info *mtd = inftl->mbd.mtd;
         unsigned int status;
         int silly = MAX_LOOPS;
         size_t retlen;
@@ -706,8 +774,8 @@ static int INFTL_deleteblock(struct INFTLrecord *inftl, unsigned block)
                 "block=%d)\n", inftl, block);
 
         while (thisEUN < inftl->nb_blocks) {
-                if (MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize) +
-                    blockofs, 8, &retlen, (char *)&bci) < 0)
+                if (inftl_read_oob(mtd, (thisEUN * inftl->EraseSize) +
+                                   blockofs, 8, &retlen, (char *)&bci) < 0)
                         status = SECTOR_IGNORE;
                 else
                         status = bci.Status | bci.Status1;
@@ -741,10 +809,10 @@ foundit:
         if (thisEUN != BLOCK_NIL) {
                 loff_t ptr = (thisEUN * inftl->EraseSize) + blockofs;
 
-                if (MTD_READOOB(inftl->mbd.mtd, ptr, 8, &retlen, (char *)&bci) < 0)
+                if (inftl_read_oob(mtd, ptr, 8, &retlen, (char *)&bci) < 0)
                         return -EIO;
                 bci.Status = bci.Status1 = SECTOR_DELETED;
-                if (MTD_WRITEOOB(inftl->mbd.mtd, ptr, 8, &retlen, (char *)&bci) < 0)
+                if (inftl_write_oob(mtd, ptr, 8, &retlen, (char *)&bci) < 0)
                         return -EIO;
                 INFTL_trydeletechain(inftl, block / (inftl->EraseSize / SECTORSIZE));
         }
@@ -784,9 +852,10 @@ static int inftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,
 
                 memset(&oob, 0xff, sizeof(struct inftl_oob));
                 oob.b.Status = oob.b.Status1 = SECTOR_USED;
-                MTD_WRITEECC(inftl->mbd.mtd, (writeEUN * inftl->EraseSize) +
-                        blockofs, SECTORSIZE, &retlen, (char *)buffer,
-                        (char *)&oob, &inftl->oobinfo);
+
+                inftl_write(inftl->mbd.mtd, (writeEUN * inftl->EraseSize) +
+                            blockofs, SECTORSIZE, &retlen, (char *)buffer,
+                            (char *)&oob);
                 /*
                  * need to write SECTOR_USED flags since they are not written
                  * in mtd_writeecc
@@ -804,17 +873,18 @@ static int inftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,
         struct INFTLrecord *inftl = (void *)mbd;
         unsigned int thisEUN = inftl->VUtable[block / (inftl->EraseSize / SECTORSIZE)];
         unsigned long blockofs = (block * SECTORSIZE) & (inftl->EraseSize - 1);
-        unsigned int status;
+        struct mtd_info *mtd = inftl->mbd.mtd;
+        unsigned int status;
         int silly = MAX_LOOPS;
-        struct inftl_bci bci;
+        struct inftl_bci bci;
         size_t retlen;
 
         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: inftl_readblock(inftl=%p,block=%ld,"
                 "buffer=%p)\n", inftl, block, buffer);
 
         while (thisEUN < inftl->nb_blocks) {
-                if (MTD_READOOB(inftl->mbd.mtd, (thisEUN * inftl->EraseSize) +
-                     blockofs, 8, &retlen, (char *)&bci) < 0)
+                if (inftl_read_oob(mtd, (thisEUN * inftl->EraseSize) +
+                                  blockofs, 8, &retlen, (char *)&bci) < 0)
                         status = SECTOR_IGNORE;
                 else
                         status = bci.Status | bci.Status1;
@@ -850,10 +920,12 @@ foundit:
                 /* The requested block is not on the media, return all 0x00 */
                 memset(buffer, 0, SECTORSIZE);
         } else {
-                size_t retlen;
+                size_t retlen;
                 loff_t ptr = (thisEUN * inftl->EraseSize) + blockofs;
-                if (MTD_READ(inftl->mbd.mtd, ptr, SECTORSIZE, &retlen,
-                    buffer))
+                int ret = mtd->read(mtd, ptr, SECTORSIZE, &retlen, buffer);
+
+                /* Handle corrected bit flips gracefully */
+                if (ret < 0 && ret != -EUCLEAN)
                         return -EIO;
         }
         return 0;
diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
index 43fdc9433882..8f6006f1a519 100644
--- a/drivers/mtd/inftlmount.c
+++ b/drivers/mtd/inftlmount.c
@@ -43,6 +43,11 @@
 
 char inftlmountrev[]="$Revision: 1.18 $";
 
+extern int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                          size_t *retlen, uint8_t *buf);
+extern int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                           size_t *retlen, uint8_t *buf);
+
 /*
  * find_boot_record: Find the INFTL Media Header and its Spare copy which
  *      contains the various device information of the INFTL partition and
@@ -57,6 +62,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
         unsigned int i, block;
         u8 buf[SECTORSIZE];
         struct INFTLMediaHeader *mh = &inftl->MediaHdr;
+        struct mtd_info *mtd = inftl->mbd.mtd;
         struct INFTLPartition *ip;
         size_t retlen;
 
@@ -80,8 +86,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
                  * Check for BNAND header first. Then whinge if it's found
                  * but later checks fail.
                  */
-                ret = MTD_READ(inftl->mbd.mtd, block * inftl->EraseSize,
-                    SECTORSIZE, &retlen, buf);
+                ret = mtd->read(mtd, block * inftl->EraseSize,
+                                SECTORSIZE, &retlen, buf);
                 /* We ignore ret in case the ECC of the MediaHeader is invalid
                    (which is apparently acceptable) */
                 if (retlen != SECTORSIZE) {
@@ -106,8 +112,9 @@ static int find_boot_record(struct INFTLrecord *inftl)
                 }
 
                 /* To be safer with BIOS, also use erase mark as discriminant */
-                if ((ret = MTD_READOOB(inftl->mbd.mtd, block * inftl->EraseSize +
-                    SECTORSIZE + 8, 8, &retlen, (char *)&h1) < 0)) {
+                if ((ret = inftl_read_oob(mtd, block * inftl->EraseSize +
+                                          SECTORSIZE + 8, 8, &retlen,
+                                          (char *)&h1) < 0)) {
                         printk(KERN_WARNING "INFTL: ANAND header found at "
                                 "0x%x in mtd%d, but OOB data read failed "
                                 "(err %d)\n", block * inftl->EraseSize,
@@ -123,8 +130,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
                 memcpy(mh, buf, sizeof(struct INFTLMediaHeader));
 
                 /* Read the spare media header at offset 4096 */
-                MTD_READ(inftl->mbd.mtd, block * inftl->EraseSize + 4096,
-                    SECTORSIZE, &retlen, buf);
+                mtd->read(mtd, block * inftl->EraseSize + 4096,
+                          SECTORSIZE, &retlen, buf);
                 if (retlen != SECTORSIZE) {
                         printk(KERN_WARNING "INFTL: Unable to read spare "
                                "Media Header\n");
@@ -233,7 +240,7 @@ static int find_boot_record(struct INFTLrecord *inftl)
                                  */
                                 instr->addr = ip->Reserved0 * inftl->EraseSize;
                                 instr->len = inftl->EraseSize;
-                                MTD_ERASE(inftl->mbd.mtd, instr);
+                                mtd->erase(mtd, instr);
                         }
                         if ((ip->lastUnit - ip->firstUnit + 1) < ip->virtualUnits) {
                                 printk(KERN_WARNING "INFTL: Media Header "
@@ -350,21 +357,21 @@ static int check_free_sectors(struct INFTLrecord *inftl, unsigned int address,
         int len, int check_oob)
 {
         u8 buf[SECTORSIZE + inftl->mbd.mtd->oobsize];
+        struct mtd_info *mtd = inftl->mbd.mtd;
         size_t retlen;
         int i;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "INFTL: check_free_sectors(inftl=%p,"
-                "address=0x%x,len=%d,check_oob=%d)\n", inftl,
-                address, len, check_oob);
-
         for (i = 0; i < len; i += SECTORSIZE) {
-                if (MTD_READECC(inftl->mbd.mtd, address, SECTORSIZE, &retlen, buf, &buf[SECTORSIZE], &inftl->oobinfo) < 0)
+                if (mtd->read(mtd, address, SECTORSIZE, &retlen, buf))
                         return -1;
                 if (memcmpb(buf, 0xff, SECTORSIZE) != 0)
                         return -1;
 
                 if (check_oob) {
-                        if (memcmpb(buf + SECTORSIZE, 0xff, inftl->mbd.mtd->oobsize) != 0)
+                        if(inftl_read_oob(mtd, address, mtd->oobsize,
+                                          &retlen, &buf[SECTORSIZE]) < 0)
+                                return -1;
+                        if (memcmpb(buf + SECTORSIZE, 0xff, mtd->oobsize) != 0)
                                 return -1;
                 }
                 address += SECTORSIZE;
@@ -387,6 +394,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
         size_t retlen;
         struct inftl_unittail uci;
         struct erase_info *instr = &inftl->instr;
+        struct mtd_info *mtd = inftl->mbd.mtd;
         int physblock;
 
         DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_formatblock(inftl=%p,"
@@ -404,8 +412,9 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
         /* Erase one physical eraseblock at a time, even though the NAND api
            allows us to group them.  This way we if we have a failure, we can
            mark only the failed block in the bbt. */
-        for (physblock = 0; physblock < inftl->EraseSize; physblock += instr->len, instr->addr += instr->len) {
-                MTD_ERASE(inftl->mbd.mtd, instr);
+        for (physblock = 0; physblock < inftl->EraseSize;
+             physblock += instr->len, instr->addr += instr->len) {
+                mtd->erase(inftl->mbd.mtd, instr);
 
                 if (instr->state == MTD_ERASE_FAILED) {
                         printk(KERN_WARNING "INFTL: error while formatting block %d\n",
@@ -414,10 +423,10 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
                 }
 
                 /*
-                * Check the "freeness" of Erase Unit before updating metadata.
-                * FixMe: is this check really necessary? Since we have check the
-                *        return code after the erase operation.
-                */
+                 * Check the "freeness" of Erase Unit before updating metadata.
+                 * FixMe: is this check really necessary? Since we have check
+                 * the return code after the erase operation.
+                 */
                 if (check_free_sectors(inftl, instr->addr, instr->len, 1) != 0)
                         goto fail;
         }
@@ -429,8 +438,7 @@ int INFTL_formatblock(struct INFTLrecord *inftl, int block)
         uci.Reserved[2] = 0;
         uci.Reserved[3] = 0;
         instr->addr = block * inftl->EraseSize + SECTORSIZE * 2;
-        if (MTD_WRITEOOB(inftl->mbd.mtd, instr->addr +
-            8, 8, &retlen, (char *)&uci) < 0)
+        if (inftl_write_oob(mtd, instr->addr + 8, 8, &retlen, (char *)&uci) < 0)
                 goto fail;
         return 0;
 fail:
@@ -549,6 +557,7 @@ void INFTL_dumpVUchains(struct INFTLrecord *s)
 
 int INFTL_mount(struct INFTLrecord *s)
 {
+        struct mtd_info *mtd = s->mbd.mtd;
         unsigned int block, first_block, prev_block, last_block;
         unsigned int first_logical_block, logical_block, erase_mark;
         int chain_length, do_format_chain;
@@ -607,10 +616,11 @@ int INFTL_mount(struct INFTLrecord *s)
                                 break;
                         }
 
-                        if (MTD_READOOB(s->mbd.mtd, block * s->EraseSize + 8,
-                            8, &retlen, (char *)&h0) < 0 ||
-                            MTD_READOOB(s->mbd.mtd, block * s->EraseSize +
-                            2 * SECTORSIZE + 8, 8, &retlen, (char *)&h1) < 0) {
+                        if (inftl_read_oob(mtd, block * s->EraseSize + 8,
+                                           8, &retlen, (char *)&h0) < 0 ||
+                            inftl_read_oob(mtd, block * s->EraseSize +
+                                           2 * SECTORSIZE + 8, 8, &retlen,
+                                           (char *)&h1) < 0) {
                                 /* Should never happen? */
                                 do_format_chain++;
                                 break;
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 97b3e0d20865..83d0b2a52527 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -37,7 +37,7 @@ config MTD_PHYSMAP_START
 config MTD_PHYSMAP_LEN
         hex "Physical length of flash mapping"
         depends on MTD_PHYSMAP
-        default "0x4000000"
+        default "0"
         help
           This is the total length of the mapping of the flash chips on
           your particular board. If there is space, or aliases, in the
@@ -78,7 +78,7 @@ config MTD_PNC2000
 
 config MTD_SC520CDP
         tristate "CFI Flash device mapped on AMD SC520 CDP"
-        depends on X86 && MTD_CFI
+        depends on X86 && MTD_CFI && MTD_CONCAT
         help
           The SC520 CDP board has two banks of CFI-compliant chips and one
           Dual-in-line JEDEC chip. This 'mapping' driver supports that
@@ -109,7 +109,7 @@ config MTD_TS5500
           mtd1 allows you to reprogram your BIOS. BE VERY CAREFUL.
 
           Note that jumper 3 ("Write Enable Drive A") must be set
-          otherwise detection won't succeeed.
+          otherwise detection won't succeed.
 
 config MTD_SBC_GXX
         tristate "CFI Flash device mapped on Arcom SBC-GXx boards"
@@ -200,8 +200,8 @@ config MTD_TSUNAMI
           Support for the flash chip on Tsunami TIG bus.
 
 config MTD_LASAT
-        tristate "Flash chips on LASAT board"
-        depends on LASAT
+        tristate "LASAT flash device"
+        depends on LASAT && MTD_CFI
         help
           Support for the flash chips on the Lasat 100 and 200 boards.
 
@@ -561,7 +561,6 @@ config MTD_PCMCIA
 config MTD_PCMCIA_ANONYMOUS
         bool "Use PCMCIA MTD drivers for anonymous PCMCIA cards"
         depends on MTD_PCMCIA
-        default N
         help
           If this option is enabled, PCMCIA cards which do not report
           anything about themselves are assumed to be MTD cards.
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index fd0f0d3187de..92b5d883d7b0 100644
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -1,5 +1,5 @@
 /*
- *  Copyright © 2001 Flaga hf. Medical Devices, Kári Davíðsson <kd@flaga.is>
+ *  Copyright © 2001 Flaga hf. Medical Devices, Kári Davíðsson <kd@flaga.is>
  *
  *  $Id: cfi_flagadm.c,v 1.15 2005/11/07 11:14:26 gleixner Exp $
  *
@@ -135,5 +135,5 @@ module_exit(cleanup_flagadm);
 
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Kári Davíðsson <kd@flaga.is>");
+MODULE_AUTHOR("Kári Davíðsson <kd@flaga.is>");
 MODULE_DESCRIPTION("MTD map driver for Flaga digital module");
diff --git a/drivers/mtd/maps/dbox2-flash.c b/drivers/mtd/maps/dbox2-flash.c
index 652813cd6c2d..85c2a9e22b1e 100644
--- a/drivers/mtd/maps/dbox2-flash.c
+++ b/drivers/mtd/maps/dbox2-flash.c
@@ -122,5 +122,5 @@ module_exit(cleanup_dbox2_flash);
 
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Kári Davíðsson <kd@flaga.is>, Bastian Blank <waldi@tuxbox.org>, Alexander Wild <wild@te-elektronik.com>");
+MODULE_AUTHOR("Kári Davíðsson <kd@flaga.is>, Bastian Blank <waldi@tuxbox.org>, Alexander Wild <wild@te-elektronik.com>");
 MODULE_DESCRIPTION("MTD map driver for D-Box 2 board");
diff --git a/drivers/mtd/maps/mtx-1_flash.c b/drivers/mtd/maps/mtx-1_flash.c
index d1e66e186746..5c25d4e552c6 100644
--- a/drivers/mtd/maps/mtx-1_flash.c
+++ b/drivers/mtd/maps/mtx-1_flash.c
@@ -4,7 +4,7 @@
  * $Id: mtx-1_flash.c,v 1.2 2005/11/07 11:14:27 gleixner Exp $
  *
  * (C) 2005 Bruno Randolf <bruno.randolf@4g-systems.biz>
- * (C) 2005 Jörn Engel <joern@wohnheim.fh-wedel.de>
+ * (C) 2005 Jörn Engel <joern@wohnheim.fh-wedel.de>
  *
  */
 
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index 54a3102ab19a..0994b5b2e331 100644
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -20,6 +20,8 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/cfi.h>
 #include <linux/reboot.h>
+#include <linux/kdev_t.h>
+#include <linux/root_dev.h>
 #include <asm/io.h>
 
 /****************************************************************************/
@@ -188,7 +190,7 @@ int nettel_eraseconfig(void)
                 set_current_state(TASK_INTERRUPTIBLE);
                 add_wait_queue(&wait_q, &wait);
 
-                ret = MTD_ERASE(mtd, &nettel_erase);
+                ret = mtd->erase(mtd, &nettel_erase);
                 if (ret) {
                         set_current_state(TASK_RUNNING);
                         remove_wait_queue(&wait_q, &wait);
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index d27f4129afd3..c861134cbc48 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -713,6 +713,7 @@ static void pcmciamtd_detach(struct pcmcia_device *link)
 
         if(dev->mtd_info) {
                 del_mtd_device(dev->mtd_info);
+                map_destroy(dev->mtd_info);
                 info("mtd%d: Removed", dev->mtd_info->index);
         }
 
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index f49ebc3c4606..433c3cac3ca9 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -14,112 +14,229 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <asm/io.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/config.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
+#include <asm/io.h>
 
-static struct mtd_info *mymtd;
-
-struct map_info physmap_map = {
-        .name = "phys_mapped_flash",
-        .phys = CONFIG_MTD_PHYSMAP_START,
-        .size = CONFIG_MTD_PHYSMAP_LEN,
-        .bankwidth = CONFIG_MTD_PHYSMAP_BANKWIDTH,
+struct physmap_flash_info {
+        struct mtd_info         *mtd;
+        struct map_info         map;
+        struct resource         *res;
+#ifdef CONFIG_MTD_PARTITIONS
+        int                     nr_parts;
+        struct mtd_partition    *parts;
+#endif
 };
 
+
+static int physmap_flash_remove(struct platform_device *dev)
+{
+        struct physmap_flash_info *info;
+        struct physmap_flash_data *physmap_data;
+
+        info = platform_get_drvdata(dev);
+        if (info == NULL)
+                return 0;
+        platform_set_drvdata(dev, NULL);
+
+        physmap_data = dev->dev.platform_data;
+
+        if (info->mtd != NULL) {
 #ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition *mtd_parts;
-static int                   mtd_parts_nb;
+                if (info->nr_parts) {
+                        del_mtd_partitions(info->mtd);
+                        kfree(info->parts);
+                } else if (physmap_data->nr_parts) {
+                        del_mtd_partitions(info->mtd);
+                } else {
+                        del_mtd_device(info->mtd);
+                }
+#else
+                del_mtd_device(info->mtd);
+#endif
+                map_destroy(info->mtd);
+        }
 
-static int num_physmap_partitions;
-static struct mtd_partition *physmap_partitions;
+        if (info->map.virt != NULL)
+                iounmap((void *)info->map.virt);
 
-static const char *part_probes[] __initdata = {"cmdlinepart", "RedBoot", NULL};
+        if (info->res != NULL) {
+                release_resource(info->res);
+                kfree(info->res);
+        }
 
-void physmap_set_partitions(struct mtd_partition *parts, int num_parts)
-{
-        physmap_partitions=parts;
-        num_physmap_partitions=num_parts;
+        return 0;
 }
-#endif /* CONFIG_MTD_PARTITIONS */
 
-static int __init init_physmap(void)
+static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
+#endif
+
+static int physmap_flash_probe(struct platform_device *dev)
 {
-        static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
-        const char **type;
+        struct physmap_flash_data *physmap_data;
+        struct physmap_flash_info *info;
+        const char **probe_type;
+        int err;
+
+        physmap_data = dev->dev.platform_data;
+        if (physmap_data == NULL)
+                return -ENODEV;
+
+        printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n",
+            (unsigned long long)dev->resource->end - dev->resource->start + 1,
+            (unsigned long long)dev->resource->start);
+
+        info = kmalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
+        if (info == NULL) {
+                err = -ENOMEM;
+                goto err_out;
+        }
+        memset(info, 0, sizeof(*info));
 
-        printk(KERN_NOTICE "physmap flash device: %lx at %lx\n", physmap_map.size, physmap_map.phys);
-        physmap_map.virt = ioremap(physmap_map.phys, physmap_map.size);
+        platform_set_drvdata(dev, info);
 
-        if (!physmap_map.virt) {
-                printk("Failed to ioremap\n");
-                return -EIO;
+        info->res = request_mem_region(dev->resource->start,
+                        dev->resource->end - dev->resource->start + 1,
+                        dev->dev.bus_id);
+        if (info->res == NULL) {
+                dev_err(&dev->dev, "Could not reserve memory region\n");
+                err = -ENOMEM;
+                goto err_out;
         }
 
-        simple_map_init(&physmap_map);
+        info->map.name = dev->dev.bus_id;
+        info->map.phys = dev->resource->start;
+        info->map.size = dev->resource->end - dev->resource->start + 1;
+        info->map.bankwidth = physmap_data->width;
+        info->map.set_vpp = physmap_data->set_vpp;
+
+        info->map.virt = ioremap(info->map.phys, info->map.size);
+        if (info->map.virt == NULL) {
+                dev_err(&dev->dev, "Failed to ioremap flash region\n");
+                err = EIO;
+                goto err_out;
+        }
 
-        mymtd = NULL;
-        type = rom_probe_types;
-        for(; !mymtd && *type; type++) {
-                mymtd = do_map_probe(*type, &physmap_map);
+        simple_map_init(&info->map);
+
+        probe_type = rom_probe_types;
+        for (; info->mtd == NULL && *probe_type != NULL; probe_type++)
+                info->mtd = do_map_probe(*probe_type, &info->map);
+        if (info->mtd == NULL) {
+                dev_err(&dev->dev, "map_probe failed\n");
+                err = -ENXIO;
+                goto err_out;
         }
-        if (mymtd) {
-                mymtd->owner = THIS_MODULE;
+        info->mtd->owner = THIS_MODULE;
 
 #ifdef CONFIG_MTD_PARTITIONS
-                mtd_parts_nb = parse_mtd_partitions(mymtd, part_probes,
-                                                    &mtd_parts, 0);
+        err = parse_mtd_partitions(info->mtd, part_probe_types, &info->parts, 0);
+        if (err > 0) {
+                add_mtd_partitions(info->mtd, info->parts, err);
+                return 0;
+        }
 
-                if (mtd_parts_nb > 0)
-                {
-                        add_mtd_partitions (mymtd, mtd_parts, mtd_parts_nb);
-                        return 0;
-                }
+        if (physmap_data->nr_parts) {
+                printk(KERN_NOTICE "Using physmap partition information\n");
+                add_mtd_partitions(info->mtd, physmap_data->parts,
+                                                physmap_data->nr_parts);
+                return 0;
+        }
+#endif
+
+        add_mtd_device(info->mtd);
+        return 0;
+
+err_out:
+        physmap_flash_remove(dev);
+        return err;
+}
+
+static struct platform_driver physmap_flash_driver = {
+        .probe          = physmap_flash_probe,
+        .remove         = physmap_flash_remove,
+        .driver         = {
+                .name   = "physmap-flash",
+        },
+};
 
-                if (num_physmap_partitions != 0)
-                {
-                        printk(KERN_NOTICE
-                               "Using physmap partition definition\n");
-                        add_mtd_partitions (mymtd, physmap_partitions, num_physmap_partitions);
-                        return 0;
-                }
 
+#ifdef CONFIG_MTD_PHYSMAP_LEN
+#if CONFIG_MTD_PHYSMAP_LEN != 0
+#warning using PHYSMAP compat code
+#define PHYSMAP_COMPAT
+#endif
 #endif
-                add_mtd_device(mymtd);
 
-                return 0;
-        }
+#ifdef PHYSMAP_COMPAT
+static struct physmap_flash_data physmap_flash_data = {
+        .width          = CONFIG_MTD_PHYSMAP_BANKWIDTH,
+};
 
-        iounmap(physmap_map.virt);
-        return -ENXIO;
-}
+static struct resource physmap_flash_resource = {
+        .start          = CONFIG_MTD_PHYSMAP_START,
+        .end            = CONFIG_MTD_PHYSMAP_START + CONFIG_MTD_PHYSMAP_LEN,
+        .flags          = IORESOURCE_MEM,
+};
 
-static void __exit cleanup_physmap(void)
+static struct platform_device physmap_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &physmap_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &physmap_flash_resource,
+};
+
+void physmap_configure(unsigned long addr, unsigned long size,
+                int bankwidth, void (*set_vpp)(struct map_info *, int))
 {
+        physmap_flash_resource.start = addr;
+        physmap_flash_resource.end = addr + size - 1;
+        physmap_flash_data.width = bankwidth;
+        physmap_flash_data.set_vpp = set_vpp;
+}
+
 #ifdef CONFIG_MTD_PARTITIONS
-        if (mtd_parts_nb) {
-                del_mtd_partitions(mymtd);
-                kfree(mtd_parts);
-        } else if (num_physmap_partitions) {
-                del_mtd_partitions(mymtd);
-        } else {
-                del_mtd_device(mymtd);
-        }
-#else
-        del_mtd_device(mymtd);
+void physmap_set_partitions(struct mtd_partition *parts, int num_parts)
+{
+        physmap_flash_data.nr_parts = num_parts;
+        physmap_flash_data.parts = parts;
+}
+#endif
 #endif
-        map_destroy(mymtd);
 
-        iounmap(physmap_map.virt);
-        physmap_map.virt = NULL;
+static int __init physmap_init(void)
+{
+        int err;
+
+        err = platform_driver_register(&physmap_flash_driver);
+#ifdef PHYSMAP_COMPAT
+        if (err == 0)
+                platform_device_register(&physmap_flash);
+#endif
+
+        return err;
 }
 
-module_init(init_physmap);
-module_exit(cleanup_physmap);
+static void __exit physmap_exit(void)
+{
+#ifdef PHYSMAP_COMPAT
+        platform_device_unregister(&physmap_flash);
+#endif
+        platform_driver_unregister(&physmap_flash_driver);
+}
 
+module_init(physmap_init);
+module_exit(physmap_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index 0758cb1d0105..24a03152d196 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -18,6 +18,7 @@
 #include <linux/ioport.h>
 #include <asm/ebus.h>
 #include <asm/oplib.h>
+#include <asm/prom.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
@@ -30,146 +31,140 @@
 #define UFLASH_WINDOW_SIZE      0x200000
 #define UFLASH_BUSWIDTH         1                       /* EBus is 8-bit */
 
-MODULE_AUTHOR
-        ("Eric Brower <ebrower@usa.net>");
-MODULE_DESCRIPTION
-        ("User-programmable flash device on Sun Microsystems boardsets");
-MODULE_SUPPORTED_DEVICE
-        ("userflash");
-MODULE_LICENSE
-        ("GPL");
+MODULE_AUTHOR("Eric Brower <ebrower@usa.net>");
+MODULE_DESCRIPTION("User-programmable flash device on Sun Microsystems boardsets");
+MODULE_SUPPORTED_DEVICE("userflash");
+MODULE_LICENSE("GPL");
+MODULE_VERSION("2.0");
 
 static LIST_HEAD(device_list);
 struct uflash_dev {
-        char *                  name;   /* device name */
+        char                    *name;  /* device name */
         struct map_info         map;    /* mtd map info */
-        struct mtd_info *       mtd;    /* mtd info */
-        struct list_head        list;
+        struct mtd_info         *mtd;   /* mtd info */
 };
 
 
 struct map_info uflash_map_templ = {
-                .name =         "SUNW,???-????",
-                .size =         UFLASH_WINDOW_SIZE,
-                .bankwidth =    UFLASH_BUSWIDTH,
+        .name =         "SUNW,???-????",
+        .size =         UFLASH_WINDOW_SIZE,
+        .bankwidth =    UFLASH_BUSWIDTH,
 };
 
-int uflash_devinit(struct linux_ebus_device* edev)
+int uflash_devinit(struct linux_ebus_device *edev, struct device_node *dp)
 {
-        int iTmp, nregs;
-        struct linux_prom_registers regs[2];
-        struct uflash_dev *pdev;
-
-        iTmp = prom_getproperty(
-                edev->prom_node, "reg", (void *)regs, sizeof(regs));
-        if ((iTmp % sizeof(regs[0])) != 0) {
-                printk("%s: Strange reg property size %d\n",
-                        UFLASH_DEVNAME, iTmp);
-                return -ENODEV;
-        }
+        struct uflash_dev *up;
+        struct resource *res;
 
-        nregs = iTmp / sizeof(regs[0]);
+        res = &edev->resource[0];
 
-        if (nregs != 1) {
+        if (edev->num_addrs != 1) {
                 /* Non-CFI userflash device-- once I find one we
                  * can work on supporting it.
                  */
                 printk("%s: unsupported device at 0x%lx (%d regs): " \
                         "email ebrower@usa.net\n",
-                        UFLASH_DEVNAME, edev->resource[0].start, nregs);
+                       dp->full_name, res->start, edev->num_addrs);
+
                 return -ENODEV;
         }
 
-        if(0 == (pdev = kmalloc(sizeof(struct uflash_dev), GFP_KERNEL))) {
-                printk("%s: unable to kmalloc new device\n", UFLASH_DEVNAME);
-                return(-ENOMEM);
-        }
+        up = kzalloc(sizeof(struct uflash_dev), GFP_KERNEL);
+        if (!up)
+                return -ENOMEM;
 
         /* copy defaults and tweak parameters */
-        memcpy(&pdev->map, &uflash_map_templ, sizeof(uflash_map_templ));
-        pdev->map.size = regs[0].reg_size;
-
-        iTmp = prom_getproplen(edev->prom_node, "model");
-        pdev->name = kmalloc(iTmp, GFP_KERNEL);
-        prom_getstring(edev->prom_node, "model", pdev->name, iTmp);
-        if(0 != pdev->name && 0 < strlen(pdev->name)) {
-                pdev->map.name = pdev->name;
-        }
-        pdev->map.phys = edev->resource[0].start;
-        pdev->map.virt = ioremap_nocache(edev->resource[0].start, pdev->map.size);
-        if(0 == pdev->map.virt) {
-                printk("%s: failed to map device\n", __FUNCTION__);
-                kfree(pdev->name);
-                kfree(pdev);
-                return(-1);
+        memcpy(&up->map, &uflash_map_templ, sizeof(uflash_map_templ));
+        up->map.size = (res->end - res->start) + 1UL;
+
+        up->name = of_get_property(dp, "model", NULL);
+        if (up->name && 0 < strlen(up->name))
+                up->map.name = up->name;
+
+        up->map.phys = res->start;
+
+        up->map.virt = ioremap_nocache(res->start, up->map.size);
+        if (!up->map.virt) {
+                printk("%s: Failed to map device.\n", dp->full_name);
+                kfree(up);
+
+                return -EINVAL;
         }
 
-        simple_map_init(&pdev->map);
+        simple_map_init(&up->map);
 
         /* MTD registration */
-        pdev->mtd = do_map_probe("cfi_probe", &pdev->map);
-        if(0 == pdev->mtd) {
-                iounmap(pdev->map.virt);
-                kfree(pdev->name);
-                kfree(pdev);
-                return(-ENXIO);
+        up->mtd = do_map_probe("cfi_probe", &up->map);
+        if (!up->mtd) {
+                iounmap(up->map.virt);
+                kfree(up);
+
+                return -ENXIO;
         }
 
-        list_add(&pdev->list, &device_list);
+        up->mtd->owner = THIS_MODULE;
 
-        pdev->mtd->owner = THIS_MODULE;
+        add_mtd_device(up->mtd);
 
-        add_mtd_device(pdev->mtd);
-        return(0);
+        dev_set_drvdata(&edev->ofdev.dev, up);
+
+        return 0;
 }
 
-static int __init uflash_init(void)
+static int __devinit uflash_probe(struct of_device *dev, const struct of_device_id *match)
 {
-        struct linux_ebus *ebus = NULL;
-        struct linux_ebus_device *edev = NULL;
-
-        for_each_ebus(ebus) {
-                for_each_ebusdev(edev, ebus) {
-                        if (!strcmp(edev->prom_name, UFLASH_OBPNAME)) {
-                                if(0 > prom_getproplen(edev->prom_node, "user")) {
-                                        DEBUG(2, "%s: ignoring device at 0x%lx\n",
-                                                        UFLASH_DEVNAME, edev->resource[0].start);
-                                } else {
-                                        uflash_devinit(edev);
-                                }
-                        }
-                }
-        }
+        struct linux_ebus_device *edev = to_ebus_device(&dev->dev);
+        struct device_node *dp = dev->node;
 
-        if(list_empty(&device_list)) {
-                printk("%s: unable to locate device\n", UFLASH_DEVNAME);
+        if (of_find_property(dp, "user", NULL))
                 return -ENODEV;
-        }
-        return(0);
+
+        return uflash_devinit(edev, dp);
 }
 
-static void __exit uflash_cleanup(void)
+static int __devexit uflash_remove(struct of_device *dev)
 {
-        struct list_head *udevlist;
-        struct uflash_dev *udev;
-
-        list_for_each(udevlist, &device_list) {
-                udev = list_entry(udevlist, struct uflash_dev, list);
-                DEBUG(2, "%s: removing device %s\n",
-                        UFLASH_DEVNAME, udev->name);
-
-                if(0 != udev->mtd) {
-                        del_mtd_device(udev->mtd);
-                        map_destroy(udev->mtd);
-                }
-                if(0 != udev->map.virt) {
-                        iounmap(udev->map.virt);
-                        udev->map.virt = NULL;
-                }
-                kfree(udev->name);
-                kfree(udev);
+        struct uflash_dev *up = dev_get_drvdata(&dev->dev);
+
+        if (up->mtd) {
+                del_mtd_device(up->mtd);
+                map_destroy(up->mtd);
         }
+        if (up->map.virt) {
+                iounmap(up->map.virt);
+                up->map.virt = NULL;
+        }
+
+        kfree(up);
+
+        return 0;
+}
+
+static struct of_device_id uflash_match[] = {
+        {
+                .name = UFLASH_OBPNAME,
+        },
+        {},
+};
+
+MODULE_DEVICE_TABLE(of, uflash_match);
+
+static struct of_platform_driver uflash_driver = {
+        .name           = UFLASH_DEVNAME,
+        .match_table    = uflash_match,
+        .probe          = uflash_probe,
+        .remove         = __devexit_p(uflash_remove),
+};
+
+static int __init uflash_init(void)
+{
+        return of_register_driver(&uflash_driver, &ebus_bus_type);
+}
+
+static void __exit uflash_exit(void)
+{
+        of_unregister_driver(&uflash_driver);
 }
 
 module_init(uflash_init);
-module_exit(uflash_cleanup);
+module_exit(uflash_exit);
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 2cef280e388c..e5c78463ebfd 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -71,7 +71,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos,
         set_current_state(TASK_INTERRUPTIBLE);
         add_wait_queue(&wait_q, &wait);
 
-        ret = MTD_ERASE(mtd, &erase);
+        ret = mtd->erase(mtd, &erase);
         if (ret) {
                 set_current_state(TASK_RUNNING);
                 remove_wait_queue(&wait_q, &wait);
@@ -88,7 +88,7 @@ static int erase_write (struct mtd_info *mtd, unsigned long pos,
          * Next, writhe data to flash.
          */
 
-        ret = MTD_WRITE (mtd, pos, len, &retlen, buf);
+        ret = mtd->write(mtd, pos, len, &retlen, buf);
         if (ret)
                 return ret;
         if (retlen != len)
@@ -138,7 +138,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
                 mtd->name, pos, len);
 
         if (!sect_size)
-                return MTD_WRITE (mtd, pos, len, &retlen, buf);
+                return mtd->write(mtd, pos, len, &retlen, buf);
 
         while (len > 0) {
                 unsigned long sect_start = (pos/sect_size)*sect_size;
@@ -170,7 +170,8 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos,
                             mtdblk->cache_offset != sect_start) {
                                 /* fill the cache with the current sector */
                                 mtdblk->cache_state = STATE_EMPTY;
-                                ret = MTD_READ(mtd, sect_start, sect_size, &retlen, mtdblk->cache_data);
+                                ret = mtd->read(mtd, sect_start, sect_size,
+                                                &retlen, mtdblk->cache_data);
                                 if (ret)
                                         return ret;
                                 if (retlen != sect_size)
@@ -207,7 +208,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,
                         mtd->name, pos, len);
 
         if (!sect_size)
-                return MTD_READ (mtd, pos, len, &retlen, buf);
+                return mtd->read(mtd, pos, len, &retlen, buf);
 
         while (len > 0) {
                 unsigned long sect_start = (pos/sect_size)*sect_size;
@@ -226,7 +227,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos,
                     mtdblk->cache_offset == sect_start) {
                         memcpy (buf, mtdblk->cache_data + offset, size);
                 } else {
-                        ret = MTD_READ (mtd, pos, size, &retlen, buf);
+                        ret = mtd->read(mtd, pos, size, &retlen, buf);
                         if (ret)
                                 return ret;
                         if (retlen != size)
@@ -288,8 +289,7 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
 
         mutex_init(&mtdblk->cache_mutex);
         mtdblk->cache_state = STATE_EMPTY;
-        if ((mtdblk->mtd->flags & MTD_CAP_RAM) != MTD_CAP_RAM &&
-            mtdblk->mtd->erasesize) {
+        if ( !(mtdblk->mtd->flags & MTD_NO_ERASE) && mtdblk->mtd->erasesize) {
                 mtdblk->cache_size = mtdblk->mtd->erasesize;
                 mtdblk->cache_data = NULL;
         }
diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c
index 0c830ba41ef0..29563ed258a4 100644
--- a/drivers/mtd/mtdblock_ro.c
+++ b/drivers/mtd/mtdblock_ro.c
@@ -45,9 +45,7 @@ static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         dev->blksize = 512;
         dev->size = mtd->size >> 9;
         dev->tr = tr;
-        if ((mtd->flags & (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE)) !=
-            (MTD_CLEAR_BITS|MTD_SET_BITS|MTD_WRITEABLE))
-                dev->readonly = 1;
+        dev->readonly = 1;
 
         add_mtd_blktrans_dev(dev);
 }
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 6f044584bdc6..aa18d45b264b 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -49,24 +49,18 @@ static struct mtd_notifier notifier = {
 };
 
 /*
- * We use file->private_data to store a pointer to the MTDdevice.
- * Since alighment is at least 32 bits, we have 2 bits free for OTP
- * modes as well.
+ * Data structure to hold the pointer to the mtd device as well
+ * as mode information ofr various use cases.
  */
-
-#define TO_MTD(file) (struct mtd_info *)((long)((file)->private_data) & ~3L)
-
-#define MTD_MODE_OTP_FACT       1
-#define MTD_MODE_OTP_USER       2
-#define MTD_MODE(file)          ((long)((file)->private_data) & 3)
-
-#define SET_MTD_MODE(file, mode) \
-        do { long __p = (long)((file)->private_data); \
-             (file)->private_data = (void *)((__p & ~3L) | mode); } while (0)
+struct mtd_file_info {
+        struct mtd_info *mtd;
+        enum mtd_file_modes mode;
+};
 
 static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)
 {
-        struct mtd_info *mtd = TO_MTD(file);
+        struct mtd_file_info *mfi = file->private_data;
+        struct mtd_info *mtd = mfi->mtd;
 
         switch (orig) {
         case 0:
@@ -97,6 +91,7 @@ static int mtd_open(struct inode *inode, struct file *file)
         int minor = iminor(inode);
         int devnum = minor >> 1;
         struct mtd_info *mtd;
+        struct mtd_file_info *mfi;
 
         DEBUG(MTD_DEBUG_LEVEL0, "MTD_open\n");
 
@@ -117,14 +112,20 @@ static int mtd_open(struct inode *inode, struct file *file)
                 return -ENODEV;
         }
 
-        file->private_data = mtd;
-
         /* You can't open it RW if it's not a writeable device */
         if ((file->f_mode & 2) && !(mtd->flags & MTD_WRITEABLE)) {
                 put_mtd_device(mtd);
                 return -EACCES;
         }
 
+        mfi = kzalloc(sizeof(*mfi), GFP_KERNEL);
+        if (!mfi) {
+                put_mtd_device(mtd);
+                return -ENOMEM;
+        }
+        mfi->mtd = mtd;
+        file->private_data = mfi;
+
         return 0;
 } /* mtd_open */
 
@@ -132,16 +133,17 @@ static int mtd_open(struct inode *inode, struct file *file)
 
 static int mtd_close(struct inode *inode, struct file *file)
 {
-        struct mtd_info *mtd;
+        struct mtd_file_info *mfi = file->private_data;
+        struct mtd_info *mtd = mfi->mtd;
 
         DEBUG(MTD_DEBUG_LEVEL0, "MTD_close\n");
 
-        mtd = TO_MTD(file);
-
         if (mtd->sync)
                 mtd->sync(mtd);
 
         put_mtd_device(mtd);
+        file->private_data = NULL;
+        kfree(mfi);
 
         return 0;
 } /* mtd_close */
@@ -153,7 +155,8 @@ static int mtd_close(struct inode *inode, struct file *file)
 
 static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t *ppos)
 {
-        struct mtd_info *mtd = TO_MTD(file);
+        struct mtd_file_info *mfi = file->private_data;
+        struct mtd_info *mtd = mfi->mtd;
         size_t retlen=0;
         size_t total_retlen=0;
         int ret=0;
@@ -170,36 +173,58 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
 
         /* FIXME: Use kiovec in 2.5 to lock down the user's buffers
            and pass them directly to the MTD functions */
+
+        if (count > MAX_KMALLOC_SIZE)
+                kbuf=kmalloc(MAX_KMALLOC_SIZE, GFP_KERNEL);
+        else
+                kbuf=kmalloc(count, GFP_KERNEL);
+
+        if (!kbuf)
+                return -ENOMEM;
+
         while (count) {
+
                 if (count > MAX_KMALLOC_SIZE)
                         len = MAX_KMALLOC_SIZE;
                 else
                         len = count;
 
-                kbuf=kmalloc(len,GFP_KERNEL);
-                if (!kbuf)
-                        return -ENOMEM;
-
-                switch (MTD_MODE(file)) {
-                case MTD_MODE_OTP_FACT:
+                switch (mfi->mode) {
+                case MTD_MODE_OTP_FACTORY:
                         ret = mtd->read_fact_prot_reg(mtd, *ppos, len, &retlen, kbuf);
                         break;
                 case MTD_MODE_OTP_USER:
                         ret = mtd->read_user_prot_reg(mtd, *ppos, len, &retlen, kbuf);
                         break;
+                case MTD_MODE_RAW:
+                {
+                        struct mtd_oob_ops ops;
+
+                        ops.mode = MTD_OOB_RAW;
+                        ops.datbuf = kbuf;
+                        ops.oobbuf = NULL;
+                        ops.len = len;
+
+                        ret = mtd->read_oob(mtd, *ppos, &ops);
+                        retlen = ops.retlen;
+                        break;
+                }
                 default:
-                        ret = MTD_READ(mtd, *ppos, len, &retlen, kbuf);
+                        ret = mtd->read(mtd, *ppos, len, &retlen, kbuf);
                 }
                 /* Nand returns -EBADMSG on ecc errors, but it returns
                  * the data. For our userspace tools it is important
                  * to dump areas with ecc errors !
+                 * For kernel internal usage it also might return -EUCLEAN
+                 * to signal the caller that a bitflip has occured and has
+                 * been corrected by the ECC algorithm.
                  * Userspace software which accesses NAND this way
                  * must be aware of the fact that it deals with NAND
                  */
-                if (!ret || (ret == -EBADMSG)) {
+                if (!ret || (ret == -EUCLEAN) || (ret == -EBADMSG)) {
                         *ppos += retlen;
                         if (copy_to_user(buf, kbuf, retlen)) {
-                                kfree(kbuf);
+                                kfree(kbuf);
                                 return -EFAULT;
                         }
                         else
@@ -215,15 +240,16 @@ static ssize_t mtd_read(struct file *file, char __user *buf, size_t count,loff_t
                         return ret;
                 }
 
-                kfree(kbuf);
         }
 
+        kfree(kbuf);
         return total_retlen;
 } /* mtd_read */
 
 static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count,loff_t *ppos)
 {
-        struct mtd_info *mtd = TO_MTD(file);
+        struct mtd_file_info *mfi = file->private_data;
+        struct mtd_info *mtd = mfi->mtd;
         char *kbuf;
         size_t retlen;
         size_t total_retlen=0;
@@ -241,25 +267,28 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
         if (!count)
                 return 0;
 
+        if (count > MAX_KMALLOC_SIZE)
+                kbuf=kmalloc(MAX_KMALLOC_SIZE, GFP_KERNEL);
+        else
+                kbuf=kmalloc(count, GFP_KERNEL);
+
+        if (!kbuf)
+                return -ENOMEM;
+
         while (count) {
+
                 if (count > MAX_KMALLOC_SIZE)
                         len = MAX_KMALLOC_SIZE;
                 else
                         len = count;
 
-                kbuf=kmalloc(len,GFP_KERNEL);
-                if (!kbuf) {
-                        printk("kmalloc is null\n");
-                        return -ENOMEM;
-                }
-
                 if (copy_from_user(kbuf, buf, len)) {
                         kfree(kbuf);
                         return -EFAULT;
                 }
 
-                switch (MTD_MODE(file)) {
-                case MTD_MODE_OTP_FACT:
+                switch (mfi->mode) {
+                case MTD_MODE_OTP_FACTORY:
                         ret = -EROFS;
                         break;
                 case MTD_MODE_OTP_USER:
@@ -269,6 +298,21 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
                         }
                         ret = mtd->write_user_prot_reg(mtd, *ppos, len, &retlen, kbuf);
                         break;
+
+                case MTD_MODE_RAW:
+                {
+                        struct mtd_oob_ops ops;
+
+                        ops.mode = MTD_OOB_RAW;
+                        ops.datbuf = kbuf;
+                        ops.oobbuf = NULL;
+                        ops.len = len;
+
+                        ret = mtd->write_oob(mtd, *ppos, &ops);
+                        retlen = ops.retlen;
+                        break;
+                }
+
                 default:
                         ret = (*(mtd->write))(mtd, *ppos, len, &retlen, kbuf);
                 }
@@ -282,10 +326,9 @@ static ssize_t mtd_write(struct file *file, const char __user *buf, size_t count
                         kfree(kbuf);
                         return ret;
                 }
-
-                kfree(kbuf);
         }
 
+        kfree(kbuf);
         return total_retlen;
 } /* mtd_write */
 
@@ -299,13 +342,45 @@ static void mtdchar_erase_callback (struct erase_info *instr)
         wake_up((wait_queue_head_t *)instr->priv);
 }
 
+#if defined(CONFIG_MTD_OTP) || defined(CONFIG_MTD_ONENAND_OTP)
+static int otp_select_filemode(struct mtd_file_info *mfi, int mode)
+{
+        struct mtd_info *mtd = mfi->mtd;
+        int ret = 0;
+
+        switch (mode) {
+        case MTD_OTP_FACTORY:
+                if (!mtd->read_fact_prot_reg)
+                        ret = -EOPNOTSUPP;
+                else
+                        mfi->mode = MTD_MODE_OTP_FACTORY;
+                break;
+        case MTD_OTP_USER:
+                if (!mtd->read_fact_prot_reg)
+                        ret = -EOPNOTSUPP;
+                else
+                        mfi->mode = MTD_MODE_OTP_USER;
+                break;
+        default:
+                ret = -EINVAL;
+        case MTD_OTP_OFF:
+                break;
+        }
+        return ret;
+}
+#else
+# define otp_select_filemode(f,m)       -EOPNOTSUPP
+#endif
+
 static int mtd_ioctl(struct inode *inode, struct file *file,
                      u_int cmd, u_long arg)
 {
-        struct mtd_info *mtd = TO_MTD(file);
+        struct mtd_file_info *mfi = file->private_data;
+        struct mtd_info *mtd = mfi->mtd;
         void __user *argp = (void __user *)arg;
         int ret = 0;
         u_long size;
+        struct mtd_info_user info;
 
         DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
 
@@ -341,7 +416,15 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         }
 
         case MEMGETINFO:
-                if (copy_to_user(argp, mtd, sizeof(struct mtd_info_user)))
+                info.type       = mtd->type;
+                info.flags      = mtd->flags;
+                info.size       = mtd->size;
+                info.erasesize  = mtd->erasesize;
+                info.writesize  = mtd->writesize;
+                info.oobsize    = mtd->oobsize;
+                info.ecctype    = mtd->ecctype;
+                info.eccsize    = mtd->eccsize;
+                if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
                         return -EFAULT;
                 break;
 
@@ -400,8 +483,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         case MEMWRITEOOB:
         {
                 struct mtd_oob_buf buf;
-                void *databuf;
-                ssize_t retlen;
+                struct mtd_oob_ops ops;
 
                 if(!(file->f_mode & 2))
                         return -EPERM;
@@ -409,7 +491,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 if (copy_from_user(&buf, argp, sizeof(struct mtd_oob_buf)))
                         return -EFAULT;
 
-                if (buf.length > 0x4096)
+                if (buf.length > 4096)
                         return -EINVAL;
 
                 if (!mtd->write_oob)
@@ -421,21 +503,32 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 if (ret)
                         return ret;
 
-                databuf = kmalloc(buf.length, GFP_KERNEL);
-                if (!databuf)
+                ops.len = buf.length;
+                ops.ooblen = buf.length;
+                ops.ooboffs = buf.start & (mtd->oobsize - 1);
+                ops.datbuf = NULL;
+                ops.mode = MTD_OOB_PLACE;
+
+                if (ops.ooboffs && ops.len > (mtd->oobsize - ops.ooboffs))
+                        return -EINVAL;
+
+                ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
+                if (!ops.oobbuf)
                         return -ENOMEM;
 
-                if (copy_from_user(databuf, buf.ptr, buf.length)) {
-                        kfree(databuf);
+                if (copy_from_user(ops.oobbuf, buf.ptr, buf.length)) {
+                        kfree(ops.oobbuf);
                         return -EFAULT;
                 }
 
-                ret = (mtd->write_oob)(mtd, buf.start, buf.length, &retlen, databuf);
+                buf.start &= ~(mtd->oobsize - 1);
+                ret = mtd->write_oob(mtd, buf.start, &ops);
 
-                if (copy_to_user(argp + sizeof(uint32_t), &retlen, sizeof(uint32_t)))
+                if (copy_to_user(argp + sizeof(uint32_t), &ops.retlen,
+                                 sizeof(uint32_t)))
                         ret = -EFAULT;
 
-                kfree(databuf);
+                kfree(ops.oobbuf);
                 break;
 
         }
@@ -443,13 +536,12 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         case MEMREADOOB:
         {
                 struct mtd_oob_buf buf;
-                void *databuf;
-                ssize_t retlen;
+                struct mtd_oob_ops ops;
 
                 if (copy_from_user(&buf, argp, sizeof(struct mtd_oob_buf)))
                         return -EFAULT;
 
-                if (buf.length > 0x4096)
+                if (buf.length > 4096)
                         return -EINVAL;
 
                 if (!mtd->read_oob)
@@ -457,22 +549,32 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 else
                         ret = access_ok(VERIFY_WRITE, buf.ptr,
                                         buf.length) ? 0 : -EFAULT;
-
                 if (ret)
                         return ret;
 
-                databuf = kmalloc(buf.length, GFP_KERNEL);
-                if (!databuf)
+                ops.len = buf.length;
+                ops.ooblen = buf.length;
+                ops.ooboffs = buf.start & (mtd->oobsize - 1);
+                ops.datbuf = NULL;
+                ops.mode = MTD_OOB_PLACE;
+
+                if (ops.ooboffs && ops.len > (mtd->oobsize - ops.ooboffs))
+                        return -EINVAL;
+
+                ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
+                if (!ops.oobbuf)
                         return -ENOMEM;
 
-                ret = (mtd->read_oob)(mtd, buf.start, buf.length, &retlen, databuf);
+                buf.start &= ~(mtd->oobsize - 1);
+                ret = mtd->read_oob(mtd, buf.start, &ops);
 
-                if (put_user(retlen, (uint32_t __user *)argp))
+                if (put_user(ops.retlen, (uint32_t __user *)argp))
                         ret = -EFAULT;
-                else if (retlen && copy_to_user(buf.ptr, databuf, retlen))
+                else if (ops.retlen && copy_to_user(buf.ptr, ops.oobbuf,
+                                                    ops.retlen))
                         ret = -EFAULT;
 
-                kfree(databuf);
+                kfree(ops.oobbuf);
                 break;
         }
 
@@ -504,16 +606,22 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 
-        case MEMSETOOBSEL:
-        {
-                if (copy_from_user(&mtd->oobinfo, argp, sizeof(struct nand_oobinfo)))
-                        return -EFAULT;
-                break;
-        }
-
+        /* Legacy interface */
         case MEMGETOOBSEL:
         {
-                if (copy_to_user(argp, &(mtd->oobinfo), sizeof(struct nand_oobinfo)))
+                struct nand_oobinfo oi;
+
+                if (!mtd->ecclayout)
+                        return -EOPNOTSUPP;
+                if (mtd->ecclayout->eccbytes > ARRAY_SIZE(oi.eccpos))
+                        return -EINVAL;
+
+                oi.useecc = MTD_NANDECC_AUTOPLACE;
+                memcpy(&oi.eccpos, mtd->ecclayout->eccpos, sizeof(oi.eccpos));
+                memcpy(&oi.oobfree, mtd->ecclayout->oobfree,
+                       sizeof(oi.oobfree));
+
+                if (copy_to_user(argp, &oi, sizeof(struct nand_oobinfo)))
                         return -EFAULT;
                 break;
         }
@@ -544,31 +652,17 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 break;
         }
 
-#ifdef CONFIG_MTD_OTP
+#if defined(CONFIG_MTD_OTP) || defined(CONFIG_MTD_ONENAND_OTP)
         case OTPSELECT:
         {
                 int mode;
                 if (copy_from_user(&mode, argp, sizeof(int)))
                         return -EFAULT;
-                SET_MTD_MODE(file, 0);
-                switch (mode) {
-                case MTD_OTP_FACTORY:
-                        if (!mtd->read_fact_prot_reg)
-                                ret = -EOPNOTSUPP;
-                        else
-                                SET_MTD_MODE(file, MTD_MODE_OTP_FACT);
-                        break;
-                case MTD_OTP_USER:
-                        if (!mtd->read_fact_prot_reg)
-                                ret = -EOPNOTSUPP;
-                        else
-                                SET_MTD_MODE(file, MTD_MODE_OTP_USER);
-                        break;
-                default:
-                        ret = -EINVAL;
-                case MTD_OTP_OFF:
-                        break;
-                }
+
+                mfi->mode = MTD_MODE_NORMAL;
+
+                ret = otp_select_filemode(mfi, mode);
+
                 file->f_pos = 0;
                 break;
         }
@@ -580,8 +674,8 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                 if (!buf)
                         return -ENOMEM;
                 ret = -EOPNOTSUPP;
-                switch (MTD_MODE(file)) {
-                case MTD_MODE_OTP_FACT:
+                switch (mfi->mode) {
+                case MTD_MODE_OTP_FACTORY:
                         if (mtd->get_fact_prot_info)
                                 ret = mtd->get_fact_prot_info(mtd, buf, 4096);
                         break;
@@ -589,6 +683,8 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                         if (mtd->get_user_prot_info)
                                 ret = mtd->get_user_prot_info(mtd, buf, 4096);
                         break;
+                default:
+                        break;
                 }
                 if (ret >= 0) {
                         if (cmd == OTPGETREGIONCOUNT) {
@@ -607,7 +703,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         {
                 struct otp_info info;
 
-                if (MTD_MODE(file) != MTD_MODE_OTP_USER)
+                if (mfi->mode != MTD_MODE_OTP_USER)
                         return -EINVAL;
                 if (copy_from_user(&info, argp, sizeof(info)))
                         return -EFAULT;
@@ -618,6 +714,49 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
         }
 #endif
 
+        case ECCGETLAYOUT:
+        {
+                if (!mtd->ecclayout)
+                        return -EOPNOTSUPP;
+
+                if (copy_to_user(argp, &mtd->ecclayout,
+                                 sizeof(struct nand_ecclayout)))
+                        return -EFAULT;
+                break;
+        }
+
+        case ECCGETSTATS:
+        {
+                if (copy_to_user(argp, &mtd->ecc_stats,
+                                 sizeof(struct mtd_ecc_stats)))
+                        return -EFAULT;
+                break;
+        }
+
+        case MTDFILEMODE:
+        {
+                mfi->mode = 0;
+
+                switch(arg) {
+                case MTD_MODE_OTP_FACTORY:
+                case MTD_MODE_OTP_USER:
+                        ret = otp_select_filemode(mfi, arg);
+                        break;
+
+                case MTD_MODE_RAW:
+                        if (!mtd->read_oob || !mtd->write_oob)
+                                return -EOPNOTSUPP;
+                        mfi->mode = arg;
+
+                case MTD_MODE_NORMAL:
+                        break;
+                default:
+                        ret = -EINVAL;
+                }
+                file->f_pos = 0;
+                break;
+        }
+
         default:
                 ret = -ENOTTY;
         }
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 9af840364a74..1fea631b5852 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -19,6 +19,8 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/concat.h>
 
+#include <asm/div64.h>
+
 /*
  * Our storage structure:
  * Subdev points to an array of pointers to struct mtd_info objects
@@ -54,7 +56,7 @@ concat_read(struct mtd_info *mtd, loff_t from, size_t len,
             size_t * retlen, u_char * buf)
 {
         struct mtd_concat *concat = CONCAT(mtd);
-        int err = -EINVAL;
+        int ret = 0, err;
         int i;
 
         *retlen = 0;
@@ -78,19 +80,29 @@ concat_read(struct mtd_info *mtd, loff_t from, size_t len,
 
                 err = subdev->read(subdev, from, size, &retsize, buf);
 
-                if (err)
-                        break;
+                /* Save information about bitflips! */
+                if (unlikely(err)) {
+                        if (err == -EBADMSG) {
+                                mtd->ecc_stats.failed++;
+                                ret = err;
+                        } else if (err == -EUCLEAN) {
+                                mtd->ecc_stats.corrected++;
+                                /* Do not overwrite -EBADMSG !! */
+                                if (!ret)
+                                        ret = err;
+                        } else
+                                return err;
+                }
 
                 *retlen += retsize;
                 len -= size;
                 if (len == 0)
-                        break;
+                        return ret;
 
-                err = -EINVAL;
                 buf += size;
                 from = 0;
         }
-        return err;
+        return -EINVAL;
 }
 
 static int
@@ -141,211 +153,185 @@ concat_write(struct mtd_info *mtd, loff_t to, size_t len,
 }
 
 static int
-concat_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
-                size_t * retlen, u_char * buf, u_char * eccbuf,
-                struct nand_oobinfo *oobsel)
+concat_writev(struct mtd_info *mtd, const struct kvec *vecs,
+                unsigned long count, loff_t to, size_t * retlen)
 {
         struct mtd_concat *concat = CONCAT(mtd);
-        int err = -EINVAL;
+        struct kvec *vecs_copy;
+        unsigned long entry_low, entry_high;
+        size_t total_len = 0;
         int i;
+        int err = -EINVAL;
 
-        *retlen = 0;
-
-        for (i = 0; i < concat->num_subdev; i++) {
-                struct mtd_info *subdev = concat->subdev[i];
-                size_t size, retsize;
-
-                if (from >= subdev->size) {
-                        /* Not destined for this subdev */
-                        size = 0;
-                        from -= subdev->size;
-                        continue;
-                }
-
-                if (from + len > subdev->size)
-                        /* First part goes into this subdev */
-                        size = subdev->size - from;
-                else
-                        /* Entire transaction goes into this subdev */
-                        size = len;
+        if (!(mtd->flags & MTD_WRITEABLE))
+                return -EROFS;
 
-                if (subdev->read_ecc)
-                        err = subdev->read_ecc(subdev, from, size,
-                                               &retsize, buf, eccbuf, oobsel);
-                else
-                        err = -EINVAL;
+        *retlen = 0;
 
-                if (err)
-                        break;
+        /* Calculate total length of data */
+        for (i = 0; i < count; i++)
+                total_len += vecs[i].iov_len;
 
-                *retlen += retsize;
-                len -= size;
-                if (len == 0)
-                        break;
+        /* Do not allow write past end of device */
+        if ((to + total_len) > mtd->size)
+                return -EINVAL;
 
-                err = -EINVAL;
-                buf += size;
-                if (eccbuf) {
-                        eccbuf += subdev->oobsize;
-                        /* in nand.c at least, eccbufs are
-                           tagged with 2 (int)eccstatus'; we
-                           must account for these */
-                        eccbuf += 2 * (sizeof (int));
-                }
-                from = 0;
+        /* Check alignment */
+        if (mtd->writesize > 1) {
+                loff_t __to = to;
+                if (do_div(__to, mtd->writesize) || (total_len % mtd->writesize))
+                        return -EINVAL;
         }
-        return err;
-}
 
-static int
-concat_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
-                 size_t * retlen, const u_char * buf, u_char * eccbuf,
-                 struct nand_oobinfo *oobsel)
-{
-        struct mtd_concat *concat = CONCAT(mtd);
-        int err = -EINVAL;
-        int i;
-
-        if (!(mtd->flags & MTD_WRITEABLE))
-                return -EROFS;
-
-        *retlen = 0;
+        /* make a copy of vecs */
+        vecs_copy = kmalloc(sizeof(struct kvec) * count, GFP_KERNEL);
+        if (!vecs_copy)
+                return -ENOMEM;
+        memcpy(vecs_copy, vecs, sizeof(struct kvec) * count);
 
+        entry_low = 0;
         for (i = 0; i < concat->num_subdev; i++) {
                 struct mtd_info *subdev = concat->subdev[i];
-                size_t size, retsize;
+                size_t size, wsize, retsize, old_iov_len;
 
                 if (to >= subdev->size) {
-                        size = 0;
                         to -= subdev->size;
                         continue;
                 }
-                if (to + len > subdev->size)
-                        size = subdev->size - to;
-                else
-                        size = len;
+
+                size = min(total_len, (size_t)(subdev->size - to));
+                wsize = size; /* store for future use */
+
+                entry_high = entry_low;
+                while (entry_high < count) {
+                        if (size <= vecs_copy[entry_high].iov_len)
+                                break;
+                        size -= vecs_copy[entry_high++].iov_len;
+                }
+
+                old_iov_len = vecs_copy[entry_high].iov_len;
+                vecs_copy[entry_high].iov_len = size;
 
                 if (!(subdev->flags & MTD_WRITEABLE))
                         err = -EROFS;
-                else if (subdev->write_ecc)
-                        err = subdev->write_ecc(subdev, to, size,
-                                                &retsize, buf, eccbuf, oobsel);
                 else
-                        err = -EINVAL;
+                        err = subdev->writev(subdev, &vecs_copy[entry_low],
+                                entry_high - entry_low + 1, to, &retsize);
+
+                vecs_copy[entry_high].iov_len = old_iov_len - size;
+                vecs_copy[entry_high].iov_base += size;
+
+                entry_low = entry_high;
 
                 if (err)
                         break;
 
                 *retlen += retsize;
-                len -= size;
-                if (len == 0)
+                total_len -= wsize;
+
+                if (total_len == 0)
                         break;
 
                 err = -EINVAL;
-                buf += size;
-                if (eccbuf)
-                        eccbuf += subdev->oobsize;
                 to = 0;
         }
+
+        kfree(vecs_copy);
         return err;
 }
 
 static int
-concat_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
-                size_t * retlen, u_char * buf)
+concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops)
 {
         struct mtd_concat *concat = CONCAT(mtd);
-        int err = -EINVAL;
-        int i;
+        struct mtd_oob_ops devops = *ops;
+        int i, err, ret = 0;
 
-        *retlen = 0;
+        ops->retlen = 0;
 
         for (i = 0; i < concat->num_subdev; i++) {
                 struct mtd_info *subdev = concat->subdev[i];
-                size_t size, retsize;
 
                 if (from >= subdev->size) {
-                        /* Not destined for this subdev */
-                        size = 0;
                         from -= subdev->size;
                         continue;
                 }
-                if (from + len > subdev->size)
-                        /* First part goes into this subdev */
-                        size = subdev->size - from;
-                else
-                        /* Entire transaction goes into this subdev */
-                        size = len;
 
-                if (subdev->read_oob)
-                        err = subdev->read_oob(subdev, from, size,
-                                               &retsize, buf);
-                else
-                        err = -EINVAL;
+                /* partial read ? */
+                if (from + devops.len > subdev->size)
+                        devops.len = subdev->size - from;
+
+                err = subdev->read_oob(subdev, from, &devops);
+                ops->retlen += devops.retlen;
+
+                /* Save information about bitflips! */
+                if (unlikely(err)) {
+                        if (err == -EBADMSG) {
+                                mtd->ecc_stats.failed++;
+                                ret = err;
+                        } else if (err == -EUCLEAN) {
+                                mtd->ecc_stats.corrected++;
+                                /* Do not overwrite -EBADMSG !! */
+                                if (!ret)
+                                        ret = err;
+                        } else
+                                return err;
+                }
 
-                if (err)
-                        break;
+                devops.len = ops->len - ops->retlen;
+                if (!devops.len)
+                        return ret;
 
-                *retlen += retsize;
-                len -= size;
-                if (len == 0)
-                        break;
+                if (devops.datbuf)
+                        devops.datbuf += devops.retlen;
+                if (devops.oobbuf)
+                        devops.oobbuf += devops.ooblen;
 
-                err = -EINVAL;
-                buf += size;
                 from = 0;
         }
-        return err;
+        return -EINVAL;
 }
 
 static int
-concat_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
-                 size_t * retlen, const u_char * buf)
+concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops)
 {
         struct mtd_concat *concat = CONCAT(mtd);
-        int err = -EINVAL;
-        int i;
+        struct mtd_oob_ops devops = *ops;
+        int i, err;
 
         if (!(mtd->flags & MTD_WRITEABLE))
                 return -EROFS;
 
-        *retlen = 0;
+        ops->retlen = 0;
 
         for (i = 0; i < concat->num_subdev; i++) {
                 struct mtd_info *subdev = concat->subdev[i];
-                size_t size, retsize;
 
                 if (to >= subdev->size) {
-                        size = 0;
                         to -= subdev->size;
                         continue;
                 }
-                if (to + len > subdev->size)
-                        size = subdev->size - to;
-                else
-                        size = len;
 
-                if (!(subdev->flags & MTD_WRITEABLE))
-                        err = -EROFS;
-                else if (subdev->write_oob)
-                        err = subdev->write_oob(subdev, to, size, &retsize,
-                                                buf);
-                else
-                        err = -EINVAL;
+                /* partial write ? */
+                if (to + devops.len > subdev->size)
+                        devops.len = subdev->size - to;
 
+                err = subdev->write_oob(subdev, to, &devops);
+                ops->retlen += devops.retlen;
                 if (err)
-                        break;
+                        return err;
 
-                *retlen += retsize;
-                len -= size;
-                if (len == 0)
-                        break;
+                devops.len = ops->len - ops->retlen;
+                if (!devops.len)
+                        return 0;
 
-                err = -EINVAL;
-                buf += size;
+                if (devops.datbuf)
+                        devops.datbuf += devops.retlen;
+                if (devops.oobbuf)
+                        devops.oobbuf += devops.ooblen;
                 to = 0;
         }
-        return err;
+        return -EINVAL;
 }
 
 static void concat_erase_callback(struct erase_info *instr)
@@ -636,6 +622,60 @@ static void concat_resume(struct mtd_info *mtd)
         }
 }
 
+static int concat_block_isbad(struct mtd_info *mtd, loff_t ofs)
+{
+        struct mtd_concat *concat = CONCAT(mtd);
+        int i, res = 0;
+
+        if (!concat->subdev[0]->block_isbad)
+                return res;
+
+        if (ofs > mtd->size)
+                return -EINVAL;
+
+        for (i = 0; i < concat->num_subdev; i++) {
+                struct mtd_info *subdev = concat->subdev[i];
+
+                if (ofs >= subdev->size) {
+                        ofs -= subdev->size;
+                        continue;
+                }
+
+                res = subdev->block_isbad(subdev, ofs);
+                break;
+        }
+
+        return res;
+}
+
+static int concat_block_markbad(struct mtd_info *mtd, loff_t ofs)
+{
+        struct mtd_concat *concat = CONCAT(mtd);
+        int i, err = -EINVAL;
+
+        if (!concat->subdev[0]->block_markbad)
+                return 0;
+
+        if (ofs > mtd->size)
+                return -EINVAL;
+
+        for (i = 0; i < concat->num_subdev; i++) {
+                struct mtd_info *subdev = concat->subdev[i];
+
+                if (ofs >= subdev->size) {
+                        ofs -= subdev->size;
+                        continue;
+                }
+
+                err = subdev->block_markbad(subdev, ofs);
+                if (!err)
+                        mtd->ecc_stats.badblocks++;
+                break;
+        }
+
+        return err;
+}
+
 /*
  * This function constructs a virtual MTD device by concatenating
  * num_devs MTD devices. A pointer to the new device object is
@@ -677,18 +717,22 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
         concat->mtd.flags = subdev[0]->flags;
         concat->mtd.size = subdev[0]->size;
         concat->mtd.erasesize = subdev[0]->erasesize;
-        concat->mtd.oobblock = subdev[0]->oobblock;
+        concat->mtd.writesize = subdev[0]->writesize;
         concat->mtd.oobsize = subdev[0]->oobsize;
         concat->mtd.ecctype = subdev[0]->ecctype;
         concat->mtd.eccsize = subdev[0]->eccsize;
-        if (subdev[0]->read_ecc)
-                concat->mtd.read_ecc = concat_read_ecc;
-        if (subdev[0]->write_ecc)
-                concat->mtd.write_ecc = concat_write_ecc;
+        if (subdev[0]->writev)
+                concat->mtd.writev = concat_writev;
         if (subdev[0]->read_oob)
                 concat->mtd.read_oob = concat_read_oob;
         if (subdev[0]->write_oob)
                 concat->mtd.write_oob = concat_write_oob;
+        if (subdev[0]->block_isbad)
+                concat->mtd.block_isbad = concat_block_isbad;
+        if (subdev[0]->block_markbad)
+                concat->mtd.block_markbad = concat_block_markbad;
+
+        concat->mtd.ecc_stats.badblocks = subdev[0]->ecc_stats.badblocks;
 
         concat->subdev[0] = subdev[0];
 
@@ -717,12 +761,12 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
                                     subdev[i]->flags & MTD_WRITEABLE;
                 }
                 concat->mtd.size += subdev[i]->size;
-                if (concat->mtd.oobblock   !=  subdev[i]->oobblock ||
+                concat->mtd.ecc_stats.badblocks +=
+                        subdev[i]->ecc_stats.badblocks;
+                if (concat->mtd.writesize   !=  subdev[i]->writesize ||
                     concat->mtd.oobsize    !=  subdev[i]->oobsize ||
                     concat->mtd.ecctype    !=  subdev[i]->ecctype ||
                     concat->mtd.eccsize    !=  subdev[i]->eccsize ||
-                    !concat->mtd.read_ecc  != !subdev[i]->read_ecc ||
-                    !concat->mtd.write_ecc != !subdev[i]->write_ecc ||
                     !concat->mtd.read_oob  != !subdev[i]->read_oob ||
                     !concat->mtd.write_oob != !subdev[i]->write_oob) {
                         kfree(concat);
@@ -734,14 +778,11 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
 
         }
 
+        concat->mtd.ecclayout = subdev[0]->ecclayout;
+
         concat->num_subdev = num_devs;
         concat->mtd.name = name;
 
-        /*
-         * NOTE: for now, we do not provide any readv()/writev() methods
-         *       because they are messy to implement and they are not
-         *       used to a great extent anyway.
-         */
         concat->mtd.erase = concat_erase;
         concat->mtd.read = concat_read;
         concat->mtd.write = concat_write;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 9905870f56e5..16a952dd486a 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -47,6 +47,7 @@ int add_mtd_device(struct mtd_info *mtd)
 {
         int i;
 
+        BUG_ON(mtd->writesize == 0);
         mutex_lock(&mtd_table_mutex);
 
         for (i=0; i < MAX_MTD_DEVICES; i++)
@@ -254,37 +255,6 @@ int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
         return ret;
 }
 
-
-/* default_mtd_readv - default mtd readv method for MTD devices that dont
- *                     implement their own
- */
-
-int default_mtd_readv(struct mtd_info *mtd, struct kvec *vecs,
-                      unsigned long count, loff_t from, size_t *retlen)
-{
-        unsigned long i;
-        size_t totlen = 0, thislen;
-        int ret = 0;
-
-        if(!mtd->read) {
-                ret = -EIO;
-        } else {
-                for (i=0; i<count; i++) {
-                        if (!vecs[i].iov_len)
-                                continue;
-                        ret = mtd->read(mtd, from, vecs[i].iov_len, &thislen, vecs[i].iov_base);
-                        totlen += thislen;
-                        if (ret || thislen != vecs[i].iov_len)
-                                break;
-                        from += vecs[i].iov_len;
-                }
-        }
-        if (retlen)
-                *retlen = totlen;
-        return ret;
-}
-
-
 EXPORT_SYMBOL(add_mtd_device);
 EXPORT_SYMBOL(del_mtd_device);
 EXPORT_SYMBOL(get_mtd_device);
@@ -292,7 +262,6 @@ EXPORT_SYMBOL(put_mtd_device);
 EXPORT_SYMBOL(register_mtd_user);
 EXPORT_SYMBOL(unregister_mtd_user);
 EXPORT_SYMBOL(default_mtd_writev);
-EXPORT_SYMBOL(default_mtd_readv);
 
 #ifdef CONFIG_PROC_FS
 
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 99395911d26f..77a7123a5c56 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -51,16 +51,21 @@ static int part_read (struct mtd_info *mtd, loff_t from, size_t len,
                         size_t *retlen, u_char *buf)
 {
         struct mtd_part *part = PART(mtd);
+        int res;
+
         if (from >= mtd->size)
                 len = 0;
         else if (from + len > mtd->size)
                 len = mtd->size - from;
-        if (part->master->read_ecc == NULL)
-                return part->master->read (part->master, from + part->offset,
-                                        len, retlen, buf);
-        else
-                return part->master->read_ecc (part->master, from + part->offset,
-                                        len, retlen, buf, NULL, &mtd->oobinfo);
+        res = part->master->read (part->master, from + part->offset,
+                                   len, retlen, buf);
+        if (unlikely(res)) {
+                if (res == -EUCLEAN)
+                        mtd->ecc_stats.corrected++;
+                if (res == -EBADMSG)
+                        mtd->ecc_stats.failed++;
+        }
+        return res;
 }
 
 static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
@@ -74,6 +79,7 @@ static int part_point (struct mtd_info *mtd, loff_t from, size_t len,
         return part->master->point (part->master, from + part->offset,
                                     len, retlen, buf);
 }
+
 static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_t len)
 {
         struct mtd_part *part = PART(mtd);
@@ -81,31 +87,25 @@ static void part_unpoint (struct mtd_info *mtd, u_char *addr, loff_t from, size_
         part->master->unpoint (part->master, addr, from + part->offset, len);
 }
 
-
-static int part_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                        size_t *retlen, u_char *buf, u_char *eccbuf, struct nand_oobinfo *oobsel)
+static int part_read_oob(struct mtd_info *mtd, loff_t from,
+                         struct mtd_oob_ops *ops)
 {
         struct mtd_part *part = PART(mtd);
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        if (from >= mtd->size)
-                len = 0;
-        else if (from + len > mtd->size)
-                len = mtd->size - from;
-        return part->master->read_ecc (part->master, from + part->offset,
-                                        len, retlen, buf, eccbuf, oobsel);
-}
+        int res;
 
-static int part_read_oob (struct mtd_info *mtd, loff_t from, size_t len,
-                        size_t *retlen, u_char *buf)
-{
-        struct mtd_part *part = PART(mtd);
         if (from >= mtd->size)
-                len = 0;
-        else if (from + len > mtd->size)
-                len = mtd->size - from;
-        return part->master->read_oob (part->master, from + part->offset,
-                                        len, retlen, buf);
+                return -EINVAL;
+        if (from + ops->len > mtd->size)
+                return -EINVAL;
+        res = part->master->read_oob(part->master, from + part->offset, ops);
+
+        if (unlikely(res)) {
+                if (res == -EUCLEAN)
+                        mtd->ecc_stats.corrected++;
+                if (res == -EBADMSG)
+                        mtd->ecc_stats.failed++;
+        }
+        return res;
 }
 
 static int part_read_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,
@@ -148,44 +148,23 @@ static int part_write (struct mtd_info *mtd, loff_t to, size_t len,
                 len = 0;
         else if (to + len > mtd->size)
                 len = mtd->size - to;
-        if (part->master->write_ecc == NULL)
-                return part->master->write (part->master, to + part->offset,
-                                        len, retlen, buf);
-        else
-                return part->master->write_ecc (part->master, to + part->offset,
-                                        len, retlen, buf, NULL, &mtd->oobinfo);
-
+        return part->master->write (part->master, to + part->offset,
+                                    len, retlen, buf);
 }
 
-static int part_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
-                        size_t *retlen, const u_char *buf,
-                         u_char *eccbuf, struct nand_oobinfo *oobsel)
+static int part_write_oob(struct mtd_info *mtd, loff_t to,
+                         struct mtd_oob_ops *ops)
 {
         struct mtd_part *part = PART(mtd);
-        if (!(mtd->flags & MTD_WRITEABLE))
-                return -EROFS;
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        if (to >= mtd->size)
-                len = 0;
-        else if (to + len > mtd->size)
-                len = mtd->size - to;
-        return part->master->write_ecc (part->master, to + part->offset,
-                                        len, retlen, buf, eccbuf, oobsel);
-}
 
-static int part_write_oob (struct mtd_info *mtd, loff_t to, size_t len,
-                        size_t *retlen, const u_char *buf)
-{
-        struct mtd_part *part = PART(mtd);
         if (!(mtd->flags & MTD_WRITEABLE))
                 return -EROFS;
+
         if (to >= mtd->size)
-                len = 0;
-        else if (to + len > mtd->size)
-                len = mtd->size - to;
-        return part->master->write_oob (part->master, to + part->offset,
-                                        len, retlen, buf);
+                return -EINVAL;
+        if (to + ops->len > mtd->size)
+                return -EINVAL;
+        return part->master->write_oob(part->master, to + part->offset, ops);
 }
 
 static int part_write_user_prot_reg (struct mtd_info *mtd, loff_t from, size_t len,
@@ -208,52 +187,8 @@ static int part_writev (struct mtd_info *mtd,  const struct kvec *vecs,
         struct mtd_part *part = PART(mtd);
         if (!(mtd->flags & MTD_WRITEABLE))
                 return -EROFS;
-        if (part->master->writev_ecc == NULL)
-                return part->master->writev (part->master, vecs, count,
+        return part->master->writev (part->master, vecs, count,
                                         to + part->offset, retlen);
-        else
-                return part->master->writev_ecc (part->master, vecs, count,
-                                        to + part->offset, retlen,
-                                        NULL, &mtd->oobinfo);
-}
-
-static int part_readv (struct mtd_info *mtd,  struct kvec *vecs,
-                         unsigned long count, loff_t from, size_t *retlen)
-{
-        struct mtd_part *part = PART(mtd);
-        if (part->master->readv_ecc == NULL)
-                return part->master->readv (part->master, vecs, count,
-                                        from + part->offset, retlen);
-        else
-                return part->master->readv_ecc (part->master, vecs, count,
-                                        from + part->offset, retlen,
-                                        NULL, &mtd->oobinfo);
-}
-
-static int part_writev_ecc (struct mtd_info *mtd,  const struct kvec *vecs,
-                         unsigned long count, loff_t to, size_t *retlen,
-                         u_char *eccbuf,  struct nand_oobinfo *oobsel)
-{
-        struct mtd_part *part = PART(mtd);
-        if (!(mtd->flags & MTD_WRITEABLE))
-                return -EROFS;
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        return part->master->writev_ecc (part->master, vecs, count,
-                                        to + part->offset, retlen,
-                                        eccbuf, oobsel);
-}
-
-static int part_readv_ecc (struct mtd_info *mtd,  struct kvec *vecs,
-                         unsigned long count, loff_t from, size_t *retlen,
-                         u_char *eccbuf,  struct nand_oobinfo *oobsel)
-{
-        struct mtd_part *part = PART(mtd);
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        return part->master->readv_ecc (part->master, vecs, count,
-                                        from + part->offset, retlen,
-                                        eccbuf, oobsel);
 }
 
 static int part_erase (struct mtd_info *mtd, struct erase_info *instr)
@@ -329,12 +264,17 @@ static int part_block_isbad (struct mtd_info *mtd, loff_t ofs)
 static int part_block_markbad (struct mtd_info *mtd, loff_t ofs)
 {
         struct mtd_part *part = PART(mtd);
+        int res;
+
         if (!(mtd->flags & MTD_WRITEABLE))
                 return -EROFS;
         if (ofs >= mtd->size)
                 return -EINVAL;
         ofs += part->offset;
-        return part->master->block_markbad(part->master, ofs);
+        res = part->master->block_markbad(part->master, ofs);
+        if (!res)
+                mtd->ecc_stats.badblocks++;
+        return res;
 }
 
 /*
@@ -398,7 +338,7 @@ int add_mtd_partitions(struct mtd_info *master,
                 slave->mtd.type = master->type;
                 slave->mtd.flags = master->flags & ~parts[i].mask_flags;
                 slave->mtd.size = parts[i].size;
-                slave->mtd.oobblock = master->oobblock;
+                slave->mtd.writesize = master->writesize;
                 slave->mtd.oobsize = master->oobsize;
                 slave->mtd.ecctype = master->ecctype;
                 slave->mtd.eccsize = master->eccsize;
@@ -415,10 +355,6 @@ int add_mtd_partitions(struct mtd_info *master,
                         slave->mtd.unpoint = part_unpoint;
                 }
 
-                if (master->read_ecc)
-                        slave->mtd.read_ecc = part_read_ecc;
-                if (master->write_ecc)
-                        slave->mtd.write_ecc = part_write_ecc;
                 if (master->read_oob)
                         slave->mtd.read_oob = part_read_oob;
                 if (master->write_oob)
@@ -443,12 +379,6 @@ int add_mtd_partitions(struct mtd_info *master,
                 }
                 if (master->writev)
                         slave->mtd.writev = part_writev;
-                if (master->readv)
-                        slave->mtd.readv = part_readv;
-                if (master->writev_ecc)
-                        slave->mtd.writev_ecc = part_writev_ecc;
-                if (master->readv_ecc)
-                        slave->mtd.readv_ecc = part_readv_ecc;
                 if (master->lock)
                         slave->mtd.lock = part_lock;
                 if (master->unlock)
@@ -528,8 +458,17 @@ int add_mtd_partitions(struct mtd_info *master,
                                 parts[i].name);
                 }
 
-                /* copy oobinfo from master */
-                memcpy(&slave->mtd.oobinfo, &master->oobinfo, sizeof(slave->mtd.oobinfo));
+                slave->mtd.ecclayout = master->ecclayout;
+                if (master->block_isbad) {
+                        uint32_t offs = 0;
+
+                        while(offs < slave->mtd.size) {
+                                if (master->block_isbad(master,
+                                                        offs + slave->offset))
+                                        slave->mtd.ecc_stats.badblocks++;
+                                offs += slave->mtd.erasesize;
+                        }
+                }
 
                 if(parts[i].mtdp)
                 {       /* store the object pointer (caller may or may not register it */
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index cfe288a6e853..3db77eec0ed2 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -23,6 +23,14 @@ config MTD_NAND_VERIFY_WRITE
           device thinks the write was successful, a bit could have been
           flipped accidentaly due to device wear or something else.
 
+config MTD_NAND_ECC_SMC
+        bool "NAND ECC Smart Media byte order"
+        depends on MTD_NAND
+        default n
+        help
+          Software ECC according to the Smart Media Specification.
+          The original Linux implementation had byte 0 and 1 swapped.
+
 config MTD_NAND_AUTCPU12
         tristate "SmartMediaCard on autronix autcpu12 board"
         depends on MTD_NAND && ARCH_AUTCPU12
@@ -49,12 +57,24 @@ config MTD_NAND_SPIA
         help
           If you had to ask, you don't have one. Say 'N'.
 
+config MTD_NAND_AMS_DELTA
+        tristate "NAND Flash device on Amstrad E3"
+        depends on MACH_AMS_DELTA && MTD_NAND
+        help
+          Support for NAND flash on Amstrad E3 (Delta).
+
 config MTD_NAND_TOTO
         tristate "NAND Flash device on TOTO board"
-        depends on ARCH_OMAP && MTD_NAND
+        depends on ARCH_OMAP && MTD_NAND && BROKEN
         help
           Support for NAND flash on Texas Instruments Toto platform.
 
+config MTD_NAND_TS7250
+        tristate "NAND Flash device on TS-7250 board"
+        depends on MACH_TS72XX && MTD_NAND
+        help
+          Support for NAND flash on Technologic Systems TS-7250 platform.
+
 config MTD_NAND_IDS
         tristate
 
@@ -76,7 +96,7 @@ config MTD_NAND_RTC_FROM4
 
 config MTD_NAND_PPCHAMELEONEVB
         tristate "NAND Flash device on PPChameleonEVB board"
-        depends on PPCHAMELEONEVB && MTD_NAND
+        depends on PPCHAMELEONEVB && MTD_NAND && BROKEN
         help
           This enables the NAND flash driver on the PPChameleon EVB Board.
 
@@ -87,7 +107,7 @@ config MTD_NAND_S3C2410
           This enables the NAND flash controller on the S3C2410 and S3C2440
           SoCs
 
-          No board specfic support is done by this driver, each board
+          No board specific support is done by this driver, each board
           must advertise a platform_device for the driver to attach.
 
 config MTD_NAND_S3C2410_DEBUG
@@ -109,6 +129,22 @@ config MTD_NAND_S3C2410_HWECC
           currently not be able to switch to software, as there is no
           implementation for ECC method used by the S3C2410
 
+config MTD_NAND_NDFC
+        tristate "NDFC NanD Flash Controller"
+        depends on MTD_NAND && 44x
+        help
+         NDFC Nand Flash Controllers are integrated in EP44x SoCs
+
+config MTD_NAND_S3C2410_CLKSTOP
+        bool "S3C2410 NAND IDLE clock stop"
+        depends on MTD_NAND_S3C2410
+        default n
+        help
+          Stop the clock to the NAND controller when there is no chip
+          selected to save power. This will mean there is a small delay
+          when the is NAND chip selected or released, but will save
+          approximately 5mA of power when there is nothing happening.
+
 config MTD_NAND_DISKONCHIP
         tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
         depends on MTD_NAND && EXPERIMENTAL
@@ -183,11 +219,24 @@ config MTD_NAND_SHARPSL
         tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
         depends on MTD_NAND && ARCH_PXA
 
+config MTD_NAND_CS553X
+        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
+        depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)
+        help
+          The CS553x companion chips for the AMD Geode processor
+          include NAND flash controllers with built-in hardware ECC
+          capabilities; enabling this option will allow you to use
+          these. The driver will check the MSRs to verify that the
+          controller is enabled for NAND, and currently requires that
+          the controller be in MMIO mode.
+
+          If you say "m", the module will be called "cs553x_nand.ko".
+
 config MTD_NAND_NANDSIM
         tristate "Support for NAND Flash Simulator"
         depends on MTD_NAND && MTD_PARTITIONS
         help
-          The simulator may simulate verious NAND flash chips for the
+          The simulator may simulate various NAND flash chips for the
           MTD nand layer.
 
 endmenu
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 41742026a52e..f74759351c91 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_MTD_NAND)			+= nand.o nand_ecc.o
 obj-$(CONFIG_MTD_NAND_IDS)              += nand_ids.o
 
 obj-$(CONFIG_MTD_NAND_SPIA)             += spia.o
+obj-$(CONFIG_MTD_NAND_AMS_DELTA)        += ams-delta.o
 obj-$(CONFIG_MTD_NAND_TOTO)             += toto.o
 obj-$(CONFIG_MTD_NAND_AUTCPU12)         += autcpu12.o
 obj-$(CONFIG_MTD_NAND_EDB7312)          += edb7312.o
@@ -17,6 +18,9 @@ obj-$(CONFIG_MTD_NAND_DISKONCHIP)	+= diskonchip.o
 obj-$(CONFIG_MTD_NAND_H1900)            += h1910.o
 obj-$(CONFIG_MTD_NAND_RTC_FROM4)        += rtc_from4.o
 obj-$(CONFIG_MTD_NAND_SHARPSL)          += sharpsl.o
+obj-$(CONFIG_MTD_NAND_TS7250)           += ts7250.o
 obj-$(CONFIG_MTD_NAND_NANDSIM)          += nandsim.o
+obj-$(CONFIG_MTD_NAND_CS553X)           += cs553x_nand.o
+obj-$(CONFIG_MTD_NAND_NDFC)             += ndfc.o
 
 nand-objs = nand_base.o nand_bbt.o
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
new file mode 100644
index 000000000000..d7897dc6b3c8
--- /dev/null
+++ b/drivers/mtd/nand/ams-delta.c
@@ -0,0 +1,237 @@
+/*
+ *  drivers/mtd/nand/ams-delta.c
+ *
+ *  Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
+ *
+ *  Derived from drivers/mtd/toto.c
+ *
+ * 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.
+ *
+ *  Overview:
+ *   This is a device driver for the NAND flash device found on the
+ *   Amstrad E3 (Delta).
+ */
+
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/sizes.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/board-ams-delta.h>
+
+/*
+ * MTD structure for E3 (Delta)
+ */
+static struct mtd_info *ams_delta_mtd = NULL;
+
+#define NAND_MASK (AMS_DELTA_LATCH2_NAND_NRE | AMS_DELTA_LATCH2_NAND_NWE | AMS_DELTA_LATCH2_NAND_CLE | AMS_DELTA_LATCH2_NAND_ALE | AMS_DELTA_LATCH2_NAND_NCE | AMS_DELTA_LATCH2_NAND_NWP)
+
+/*
+ * Define partitions for flash devices
+ */
+
+static struct mtd_partition partition_info[] = {
+        { .name         = "Kernel",
+          .offset       = 0,
+          .size         = 3 * SZ_1M + SZ_512K },
+        { .name         = "u-boot",
+          .offset       = 3 * SZ_1M + SZ_512K,
+          .size         = SZ_256K },
+        { .name         = "u-boot params",
+          .offset       = 3 * SZ_1M + SZ_512K + SZ_256K,
+          .size         = SZ_256K },
+        { .name         = "Amstrad LDR",
+          .offset       = 4 * SZ_1M,
+          .size         = SZ_256K },
+        { .name         = "File system",
+          .offset       = 4 * SZ_1M + 1 * SZ_256K,
+          .size         = 27 * SZ_1M },
+        { .name         = "PBL reserved",
+          .offset       = 32 * SZ_1M - 3 * SZ_256K,
+          .size         =  3 * SZ_256K },
+};
+
+static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte)
+{
+        struct nand_chip *this = mtd->priv;
+
+        omap_writew(0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
+        omap_writew(byte, this->IO_ADDR_W);
+        ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, 0);
+        ndelay(40);
+        ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE,
+                               AMS_DELTA_LATCH2_NAND_NWE);
+}
+
+static u_char ams_delta_read_byte(struct mtd_info *mtd)
+{
+        u_char res;
+        struct nand_chip *this = mtd->priv;
+
+        ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, 0);
+        ndelay(40);
+        omap_writew(~0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL));
+        res = omap_readw(this->IO_ADDR_R);
+        ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE,
+                               AMS_DELTA_LATCH2_NAND_NRE);
+
+        return res;
+}
+
+static void ams_delta_write_buf(struct mtd_info *mtd, const u_char *buf,
+                                int len)
+{
+        int i;
+
+        for (i=0; i<len; i++)
+                ams_delta_write_byte(mtd, buf[i]);
+}
+
+static void ams_delta_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+{
+        int i;
+
+        for (i=0; i<len; i++)
+                buf[i] = ams_delta_read_byte(mtd);
+}
+
+static int ams_delta_verify_buf(struct mtd_info *mtd, const u_char *buf,
+                                int len)
+{
+        int i;
+
+        for (i=0; i<len; i++)
+                if (buf[i] != ams_delta_read_byte(mtd))
+                        return -EFAULT;
+
+        return 0;
+}
+
+/*
+ * Command control function
+ *
+ * ctrl:
+ * NAND_NCE: bit 0 -> bit 2
+ * NAND_CLE: bit 1 -> bit 7
+ * NAND_ALE: bit 2 -> bit 6
+ */
+static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd,
+                                unsigned int ctrl)
+{
+
+        if (ctrl & NAND_CTRL_CHANGE) {
+                unsigned long bits;
+
+                bits = (~ctrl & NAND_NCE) << 2;
+                bits |= (ctrl & NAND_CLE) << 7;
+                bits |= (ctrl & NAND_ALE) << 6;
+
+                ams_delta_latch2_write(0xC2, bits);
+        }
+
+        if (cmd != NAND_CMD_NONE)
+                ams_delta_write_byte(mtd, cmd);
+}
+
+static int ams_delta_nand_ready(struct mtd_info *mtd)
+{
+        return omap_get_gpio_datain(AMS_DELTA_GPIO_PIN_NAND_RB);
+}
+
+/*
+ * Main initialization routine
+ */
+static int __init ams_delta_init(void)
+{
+        struct nand_chip *this;
+        int err = 0;
+
+        /* Allocate memory for MTD device structure and private data */
+        ams_delta_mtd = kmalloc(sizeof(struct mtd_info) +
+                                sizeof(struct nand_chip), GFP_KERNEL);
+        if (!ams_delta_mtd) {
+                printk (KERN_WARNING "Unable to allocate E3 NAND MTD device structure.\n");
+                err = -ENOMEM;
+                goto out;
+        }
+
+        ams_delta_mtd->owner = THIS_MODULE;
+
+        /* Get pointer to private data */
+        this = (struct nand_chip *) (&ams_delta_mtd[1]);
+
+        /* Initialize structures */
+        memset(ams_delta_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
+
+        /* Link the private data with the MTD structure */
+        ams_delta_mtd->priv = this;
+
+        /* Set address of NAND IO lines */
+        this->IO_ADDR_R = (OMAP_MPUIO_BASE + OMAP_MPUIO_INPUT_LATCH);
+        this->IO_ADDR_W = (OMAP_MPUIO_BASE + OMAP_MPUIO_OUTPUT);
+        this->read_byte = ams_delta_read_byte;
+        this->write_buf = ams_delta_write_buf;
+        this->read_buf = ams_delta_read_buf;
+        this->verify_buf = ams_delta_verify_buf;
+        this->cmd_ctrl = ams_delta_hwcontrol;
+        if (!omap_request_gpio(AMS_DELTA_GPIO_PIN_NAND_RB)) {
+                this->dev_ready = ams_delta_nand_ready;
+        } else {
+                this->dev_ready = NULL;
+                printk(KERN_NOTICE "Couldn't request gpio for Delta NAND ready.\n");
+        }
+        /* 25 us command delay time */
+        this->chip_delay = 30;
+        this->ecc.mode = NAND_ECC_SOFT;
+
+        /* Set chip enabled, but  */
+        ams_delta_latch2_write(NAND_MASK, AMS_DELTA_LATCH2_NAND_NRE |
+                                          AMS_DELTA_LATCH2_NAND_NWE |
+                                          AMS_DELTA_LATCH2_NAND_NCE |
+                                          AMS_DELTA_LATCH2_NAND_NWP);
+
+        /* Scan to find existance of the device */
+        if (nand_scan(ams_delta_mtd, 1)) {
+                err = -ENXIO;
+                goto out_mtd;
+        }
+
+        /* Register the partitions */
+        add_mtd_partitions(ams_delta_mtd, partition_info,
+                           ARRAY_SIZE(partition_info));
+
+        goto out;
+
+ out_mtd:
+        kfree(ams_delta_mtd);
+ out:
+        return err;
+}
+
+module_init(ams_delta_init);
+
+/*
+ * Clean up routine
+ */
+static void __exit ams_delta_cleanup(void)
+{
+        /* Release resources, unregister device */
+        nand_release(ams_delta_mtd);
+
+        /* Free the MTD device structure */
+        kfree(ams_delta_mtd);
+}
+module_exit(ams_delta_cleanup);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jonathan McDowell <noodles@earth.li>");
+MODULE_DESCRIPTION("Glue layer for NAND flash on Amstrad E3 (Delta)");
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index bde3550910a2..31228334da12 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
@@ -38,22 +39,21 @@
  */
 static struct mtd_info *au1550_mtd = NULL;
 static void __iomem *p_nand;
-static int nand_width = 1; /* default x8*/
+static int nand_width = 1;      /* default x8 */
+static void (*au1550_write_byte)(struct mtd_info *, u_char);
 
 /*
  * Define partitions for flash device
  */
 static const struct mtd_partition partition_info[] = {
         {
-                .name   = "NAND FS 0",
-                .offset = 0,
-                .size   = 8*1024*1024
-        },
+         .name = "NAND FS 0",
+         .offset = 0,
+         .size = 8 * 1024 * 1024},
         {
-                .name   = "NAND FS 1",
-                .offset =  MTDPART_OFS_APPEND,
-                .size   =    MTDPART_SIZ_FULL
-        }
+         .name = "NAND FS 1",
+         .offset = MTDPART_OFS_APPEND,
+         .size = MTDPART_SIZ_FULL}
 };
 
 /**
@@ -130,21 +130,6 @@ static u16 au_read_word(struct mtd_info *mtd)
 }
 
 /**
- * au_write_word -  write one word to the chip
- * @mtd:        MTD device structure
- * @word:       data word to write
- *
- *  write function for 16bit buswith without
- * endianess conversion
- */
-static void au_write_word(struct mtd_info *mtd, u16 word)
-{
-        struct nand_chip *this = mtd->priv;
-        writew(word, this->IO_ADDR_W);
-        au_sync();
-}
-
-/**
  * au_write_buf -  write buffer to chip
  * @mtd:        MTD device structure
  * @buf:        data buffer
@@ -157,7 +142,7 @@ static void au_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
         int i;
         struct nand_chip *this = mtd->priv;
 
-        for (i=0; i<len; i++) {
+        for (i = 0; i < len; i++) {
                 writeb(buf[i], this->IO_ADDR_W);
                 au_sync();
         }
@@ -176,7 +161,7 @@ static void au_read_buf(struct mtd_info *mtd, u_char *buf, int len)
         int i;
         struct nand_chip *this = mtd->priv;
 
-        for (i=0; i<len; i++) {
+        for (i = 0; i < len; i++) {
                 buf[i] = readb(this->IO_ADDR_R);
                 au_sync();
         }
@@ -195,7 +180,7 @@ static int au_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
         int i;
         struct nand_chip *this = mtd->priv;
 
-        for (i=0; i<len; i++) {
+        for (i = 0; i < len; i++) {
                 if (buf[i] != readb(this->IO_ADDR_R))
                         return -EFAULT;
                 au_sync();
@@ -219,7 +204,7 @@ static void au_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)
         u16 *p = (u16 *) buf;
         len >>= 1;
 
-        for (i=0; i<len; i++) {
+        for (i = 0; i < len; i++) {
                 writew(p[i], this->IO_ADDR_W);
                 au_sync();
         }
@@ -241,7 +226,7 @@ static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
         u16 *p = (u16 *) buf;
         len >>= 1;
 
-        for (i=0; i<len; i++) {
+        for (i = 0; i < len; i++) {
                 p[i] = readw(this->IO_ADDR_R);
                 au_sync();
         }
@@ -262,7 +247,7 @@ static int au_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)
         u16 *p = (u16 *) buf;
         len >>= 1;
 
-        for (i=0; i<len; i++) {
+        for (i = 0; i < len; i++) {
                 if (p[i] != readw(this->IO_ADDR_R))
                         return -EFAULT;
                 au_sync();
@@ -270,32 +255,52 @@ static int au_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)
         return 0;
 }
 
+/* Select the chip by setting nCE to low */
+#define NAND_CTL_SETNCE         1
+/* Deselect the chip by setting nCE to high */
+#define NAND_CTL_CLRNCE         2
+/* Select the command latch by setting CLE to high */
+#define NAND_CTL_SETCLE         3
+/* Deselect the command latch by setting CLE to low */
+#define NAND_CTL_CLRCLE         4
+/* Select the address latch by setting ALE to high */
+#define NAND_CTL_SETALE         5
+/* Deselect the address latch by setting ALE to low */
+#define NAND_CTL_CLRALE         6
 
 static void au1550_hwcontrol(struct mtd_info *mtd, int cmd)
 {
         register struct nand_chip *this = mtd->priv;
 
-        switch(cmd){
+        switch (cmd) {
 
-        case NAND_CTL_SETCLE: this->IO_ADDR_W = p_nand + MEM_STNAND_CMD; break;
-        case NAND_CTL_CLRCLE: this->IO_ADDR_W = p_nand + MEM_STNAND_DATA; break;
+        case NAND_CTL_SETCLE:
+                this->IO_ADDR_W = p_nand + MEM_STNAND_CMD;
+                break;
+
+        case NAND_CTL_CLRCLE:
+                this->IO_ADDR_W = p_nand + MEM_STNAND_DATA;
+                break;
+
+        case NAND_CTL_SETALE:
+                this->IO_ADDR_W = p_nand + MEM_STNAND_ADDR;
+                break;
 
-        case NAND_CTL_SETALE: this->IO_ADDR_W = p_nand + MEM_STNAND_ADDR; break;
         case NAND_CTL_CLRALE:
                 this->IO_ADDR_W = p_nand + MEM_STNAND_DATA;
-                /* FIXME: Nobody knows why this is neccecary,
+                /* FIXME: Nobody knows why this is necessary,
                  * but it works only that way */
                 udelay(1);
                 break;
 
         case NAND_CTL_SETNCE:
                 /* assert (force assert) chip enable */
-                au_writel((1<<(4+NAND_CS)) , MEM_STNDCTL); break;
+                au_writel((1 << (4 + NAND_CS)), MEM_STNDCTL);
                 break;
 
         case NAND_CTL_CLRNCE:
-                /* deassert chip enable */
-                au_writel(0, MEM_STNDCTL); break;
+                /* deassert chip enable */
+                au_writel(0, MEM_STNDCTL);
                 break;
         }
 
@@ -312,69 +317,200 @@ int au1550_device_ready(struct mtd_info *mtd)
         return ret;
 }
 
+/**
+ * au1550_select_chip - control -CE line
+ *      Forbid driving -CE manually permitting the NAND controller to do this.
+ *      Keeping -CE asserted during the whole sector reads interferes with the
+ *      NOR flash and PCMCIA drivers as it causes contention on the static bus.
+ *      We only have to hold -CE low for the NAND read commands since the flash
+ *      chip needs it to be asserted during chip not ready time but the NAND
+ *      controller keeps it released.
+ *
+ * @mtd:        MTD device structure
+ * @chip:       chipnumber to select, -1 for deselect
+ */
+static void au1550_select_chip(struct mtd_info *mtd, int chip)
+{
+}
+
+/**
+ * au1550_command - Send command to NAND device
+ * @mtd:        MTD device structure
+ * @command:    the command to be sent
+ * @column:     the column address for this command, -1 if none
+ * @page_addr:  the page address for this command, -1 if none
+ */
+static void au1550_command(struct mtd_info *mtd, unsigned command, int column, int page_addr)
+{
+        register struct nand_chip *this = mtd->priv;
+        int ce_override = 0, i;
+        ulong flags;
+
+        /* Begin command latch cycle */
+        au1550_hwcontrol(mtd, NAND_CTL_SETCLE);
+        /*
+         * Write out the command to the device.
+         */
+        if (command == NAND_CMD_SEQIN) {
+                int readcmd;
+
+                if (column >= mtd->writesize) {
+                        /* OOB area */
+                        column -= mtd->writesize;
+                        readcmd = NAND_CMD_READOOB;
+                } else if (column < 256) {
+                        /* First 256 bytes --> READ0 */
+                        readcmd = NAND_CMD_READ0;
+                } else {
+                        column -= 256;
+                        readcmd = NAND_CMD_READ1;
+                }
+                au1550_write_byte(mtd, readcmd);
+        }
+        au1550_write_byte(mtd, command);
+
+        /* Set ALE and clear CLE to start address cycle */
+        au1550_hwcontrol(mtd, NAND_CTL_CLRCLE);
+
+        if (column != -1 || page_addr != -1) {
+                au1550_hwcontrol(mtd, NAND_CTL_SETALE);
+
+                /* Serially input address */
+                if (column != -1) {
+                        /* Adjust columns for 16 bit buswidth */
+                        if (this->options & NAND_BUSWIDTH_16)
+                                column >>= 1;
+                        au1550_write_byte(mtd, column);
+                }
+                if (page_addr != -1) {
+                        au1550_write_byte(mtd, (u8)(page_addr & 0xff));
+
+                        if (command == NAND_CMD_READ0 ||
+                            command == NAND_CMD_READ1 ||
+                            command == NAND_CMD_READOOB) {
+                                /*
+                                 * NAND controller will release -CE after
+                                 * the last address byte is written, so we'll
+                                 * have to forcibly assert it. No interrupts
+                                 * are allowed while we do this as we don't
+                                 * want the NOR flash or PCMCIA drivers to
+                                 * steal our precious bytes of data...
+                                 */
+                                ce_override = 1;
+                                local_irq_save(flags);
+                                au1550_hwcontrol(mtd, NAND_CTL_SETNCE);
+                        }
+
+                        au1550_write_byte(mtd, (u8)(page_addr >> 8));
+
+                        /* One more address cycle for devices > 32MiB */
+                        if (this->chipsize > (32 << 20))
+                                au1550_write_byte(mtd, (u8)((page_addr >> 16) & 0x0f));
+                }
+                /* Latch in address */
+                au1550_hwcontrol(mtd, NAND_CTL_CLRALE);
+        }
+
+        /*
+         * Program and erase have their own busy handlers.
+         * Status and sequential in need no delay.
+         */
+        switch (command) {
+
+        case NAND_CMD_PAGEPROG:
+        case NAND_CMD_ERASE1:
+        case NAND_CMD_ERASE2:
+        case NAND_CMD_SEQIN:
+        case NAND_CMD_STATUS:
+                return;
+
+        case NAND_CMD_RESET:
+                break;
+
+        case NAND_CMD_READ0:
+        case NAND_CMD_READ1:
+        case NAND_CMD_READOOB:
+                /* Check if we're really driving -CE low (just in case) */
+                if (unlikely(!ce_override))
+                        break;
+
+                /* Apply a short delay always to ensure that we do wait tWB. */
+                ndelay(100);
+                /* Wait for a chip to become ready... */
+                for (i = this->chip_delay; !this->dev_ready(mtd) && i > 0; --i)
+                        udelay(1);
+
+                /* Release -CE and re-enable interrupts. */
+                au1550_hwcontrol(mtd, NAND_CTL_CLRNCE);
+                local_irq_restore(flags);
+                return;
+        }
+        /* Apply this short delay always to ensure that we do wait tWB. */
+        ndelay(100);
+
+        while(!this->dev_ready(mtd));
+}
+
+
 /*
  * Main initialization routine
  */
-int __init au1xxx_nand_init (void)
+static int __init au1xxx_nand_init(void)
 {
         struct nand_chip *this;
-        u16 boot_swapboot = 0; /* default value */
+        u16 boot_swapboot = 0;  /* default value */
         int retval;
         u32 mem_staddr;
         u32 nand_phys;
 
         /* Allocate memory for MTD device structure and private data */
-        au1550_mtd = kmalloc (sizeof(struct mtd_info) +
-                        sizeof (struct nand_chip), GFP_KERNEL);
+        au1550_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!au1550_mtd) {
-                printk ("Unable to allocate NAND MTD dev structure.\n");
+                printk("Unable to allocate NAND MTD dev structure.\n");
                 return -ENOMEM;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&au1550_mtd[1]);
+        this = (struct nand_chip *)(&au1550_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) au1550_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(au1550_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         au1550_mtd->priv = this;
+        au1550_mtd->owner = THIS_MODULE;
 
 
-        /* disable interrupts */
-        au_writel(au_readl(MEM_STNDCTL) & ~(1<<8), MEM_STNDCTL);
-
-        /* disable NAND boot */
-        au_writel(au_readl(MEM_STNDCTL) & ~(1<<0), MEM_STNDCTL);
+        /* MEM_STNDCTL: disable ints, disable nand boot */
+        au_writel(0, MEM_STNDCTL);
 
 #ifdef CONFIG_MIPS_PB1550
         /* set gpio206 high */
-        au_writel(au_readl(GPIO2_DIR) & ~(1<<6), GPIO2_DIR);
+        au_writel(au_readl(GPIO2_DIR) & ~(1 << 6), GPIO2_DIR);
 
-        boot_swapboot = (au_readl(MEM_STSTAT) & (0x7<<1)) |
-                ((bcsr->status >> 6)  & 0x1);
+        boot_swapboot = (au_readl(MEM_STSTAT) & (0x7 << 1)) | ((bcsr->status >> 6) & 0x1);
         switch (boot_swapboot) {
-                case 0:
-                case 2:
-                case 8:
-                case 0xC:
-                case 0xD:
-                        /* x16 NAND Flash */
-                        nand_width = 0;
-                        break;
-                case 1:
-                case 9:
-                case 3:
-                case 0xE:
-                case 0xF:
-                        /* x8 NAND Flash */
-                        nand_width = 1;
-                        break;
-                default:
-                        printk("Pb1550 NAND: bad boot:swap\n");
-                        retval = -EINVAL;
-                        goto outmem;
+        case 0:
+        case 2:
+        case 8:
+        case 0xC:
+        case 0xD:
+                /* x16 NAND Flash */
+                nand_width = 0;
+                break;
+        case 1:
+        case 9:
+        case 3:
+        case 0xE:
+        case 0xF:
+                /* x8 NAND Flash */
+                nand_width = 1;
+                break;
+        default:
+                printk("Pb1550 NAND: bad boot:swap\n");
+                retval = -EINVAL;
+                goto outmem;
         }
 #endif
 
@@ -424,21 +560,22 @@ int __init au1xxx_nand_init (void)
 
         /* make controller and MTD agree */
         if (NAND_CS == 0)
-                nand_width = au_readl(MEM_STCFG0) & (1<<22);
+                nand_width = au_readl(MEM_STCFG0) & (1 << 22);
         if (NAND_CS == 1)
-                nand_width = au_readl(MEM_STCFG1) & (1<<22);
+                nand_width = au_readl(MEM_STCFG1) & (1 << 22);
         if (NAND_CS == 2)
-                nand_width = au_readl(MEM_STCFG2) & (1<<22);
+                nand_width = au_readl(MEM_STCFG2) & (1 << 22);
         if (NAND_CS == 3)
-                nand_width = au_readl(MEM_STCFG3) & (1<<22);
-
+                nand_width = au_readl(MEM_STCFG3) & (1 << 22);
 
         /* Set address of hardware control function */
-        this->hwcontrol = au1550_hwcontrol;
         this->dev_ready = au1550_device_ready;
+        this->select_chip = au1550_select_chip;
+        this->cmdfunc = au1550_command;
+
         /* 30 us command delay time */
         this->chip_delay = 30;
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
 
         this->options = NAND_NO_AUTOINCR;
 
@@ -446,15 +583,14 @@ int __init au1xxx_nand_init (void)
                 this->options |= NAND_BUSWIDTH_16;
 
         this->read_byte = (!nand_width) ? au_read_byte16 : au_read_byte;
-        this->write_byte = (!nand_width) ? au_write_byte16 : au_write_byte;
-        this->write_word = au_write_word;
+        au1550_write_byte = (!nand_width) ? au_write_byte16 : au_write_byte;
         this->read_word = au_read_word;
         this->write_buf = (!nand_width) ? au_write_buf16 : au_write_buf;
         this->read_buf = (!nand_width) ? au_read_buf16 : au_read_buf;
         this->verify_buf = (!nand_width) ? au_verify_buf16 : au_verify_buf;
 
         /* Scan to find existence of the device */
-        if (nand_scan (au1550_mtd, 1)) {
+        if (nand_scan(au1550_mtd, 1)) {
                 retval = -ENXIO;
                 goto outio;
         }
@@ -465,10 +601,10 @@ int __init au1xxx_nand_init (void)
         return 0;
 
  outio:
-        iounmap ((void *)p_nand);
+        iounmap((void *)p_nand);
 
  outmem:
-        kfree (au1550_mtd);
+        kfree(au1550_mtd);
         return retval;
 }
 
@@ -477,22 +613,21 @@ module_init(au1xxx_nand_init);
 /*
  * Clean up routine
  */
-#ifdef MODULE
-static void __exit au1550_cleanup (void)
+static void __exit au1550_cleanup(void)
 {
-        struct nand_chip *this = (struct nand_chip *) &au1550_mtd[1];
+        struct nand_chip *this = (struct nand_chip *)&au1550_mtd[1];
 
         /* Release resources, unregister device */
-        nand_release (au1550_mtd);
+        nand_release(au1550_mtd);
 
         /* Free the MTD device structure */
-        kfree (au1550_mtd);
+        kfree(au1550_mtd);
 
         /* Unmap */
-        iounmap ((void *)p_nand);
+        iounmap((void *)p_nand);
 }
+
 module_exit(au1550_cleanup);
-#endif
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Embedded Edge, LLC");
diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c
index a3c7fea404d0..fe94ae9ae1f2 100644
--- a/drivers/mtd/nand/autcpu12.c
+++ b/drivers/mtd/nand/autcpu12.c
@@ -4,7 +4,7 @@
  *  Copyright (c) 2002 Thomas Gleixner <tgxl@linutronix.de>
  *
  *  Derived from drivers/mtd/spia.c
- *       Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
+ *       Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
  *
  * $Id: autcpu12.c,v 1.23 2005/11/07 11:14:30 gleixner Exp $
  *
@@ -42,12 +42,7 @@
  * MTD structure for AUTCPU12 board
  */
 static struct mtd_info *autcpu12_mtd = NULL;
-
-static int autcpu12_io_base = CS89712_VIRT_BASE;
-static int autcpu12_fio_pbase = AUTCPU12_PHYS_SMC;
-static int autcpu12_fio_ctrl = AUTCPU12_SMC_SELECT_OFFSET;
-static int autcpu12_pedr = AUTCPU12_SMC_PORT_OFFSET;
-static void __iomem * autcpu12_fio_base;
+static void __iomem *autcpu12_fio_base;
 
 /*
  * Define partitions for flash devices
@@ -94,108 +89,131 @@ static struct mtd_partition partition_info128k[] = {
 #define NUM_PARTITIONS128K 2
 /*
  *      hardware specific access to control-lines
-*/
-static void autcpu12_hwcontrol(struct mtd_info *mtd, int cmd)
+ *
+ *      ALE bit 4 autcpu12_pedr
+ *      CLE bit 5 autcpu12_pedr
+ *      NCE bit 0 fio_ctrl
+ *
+ */
+static void autcpu12_hwcontrol(struct mtd_info *mtd, int cmd,
+                               unsigned int ctrl)
 {
+        struct nand_chip *chip = mtd->priv;
 
-        switch(cmd){
-
-                case NAND_CTL_SETCLE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) |=  AUTCPU12_SMC_CLE; break;
-                case NAND_CTL_CLRCLE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) &= ~AUTCPU12_SMC_CLE; break;
+        if (ctrl & NAND_CTRL_CHANGE) {
+                void __iomem *addr
+                unsigned char bits;
 
-                case NAND_CTL_SETALE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) |=  AUTCPU12_SMC_ALE; break;
-                case NAND_CTL_CLRALE: (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) &= ~AUTCPU12_SMC_ALE; break;
+                addr = CS89712_VIRT_BASE + AUTCPU12_SMC_PORT_OFFSET;
+                bits = (ctrl & NAND_CLE) << 4;
+                bits |= (ctrl & NAND_ALE) << 2;
+                writeb((readb(addr) & ~0x30) | bits, addr);
 
-                case NAND_CTL_SETNCE: (*(volatile unsigned char *) (autcpu12_fio_base + autcpu12_fio_ctrl)) = 0x01; break;
-                case NAND_CTL_CLRNCE: (*(volatile unsigned char *) (autcpu12_fio_base + autcpu12_fio_ctrl)) = 0x00; break;
+                addr = autcpu12_fio_base + AUTCPU12_SMC_SELECT_OFFSET;
+                writeb((readb(addr) & ~0x1) | (ctrl & NAND_NCE), addr);
         }
+
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
 }
 
 /*
-*       read device ready pin
-*/
+ *      read device ready pin
+ */
 int autcpu12_device_ready(struct mtd_info *mtd)
 {
+        void __iomem *addr = CS89712_VIRT_BASE + AUTCPU12_SMC_PORT_OFFSET;
 
-        return ( (*(volatile unsigned char *) (autcpu12_io_base + autcpu12_pedr)) & AUTCPU12_SMC_RDY) ? 1 : 0;
-
+        return readb(addr) & AUTCPU12_SMC_RDY;
 }
 
 /*
  * Main initialization routine
  */
-int __init autcpu12_init (void)
+static int __init autcpu12_init(void)
 {
         struct nand_chip *this;
         int err = 0;
 
         /* Allocate memory for MTD device structure and private data */
-        autcpu12_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),
-                                GFP_KERNEL);
+        autcpu12_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip),
+                               GFP_KERNEL);
         if (!autcpu12_mtd) {
-                printk ("Unable to allocate AUTCPU12 NAND MTD device structure.\n");
+                printk("Unable to allocate AUTCPU12 NAND MTD device structure.\n");
                 err = -ENOMEM;
                 goto out;
         }
 
         /* map physical adress */
-        autcpu12_fio_base = ioremap(autcpu12_fio_pbase,SZ_1K);
-        if(!autcpu12_fio_base){
+        autcpu12_fio_base = ioremap(AUTCPU12_PHYS_SMC, SZ_1K);
+        if (!autcpu12_fio_base) {
                 printk("Ioremap autcpu12 SmartMedia Card failed\n");
                 err = -EIO;
                 goto out_mtd;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&autcpu12_mtd[1]);
+        this = (struct nand_chip *)(&autcpu12_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) autcpu12_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(autcpu12_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         autcpu12_mtd->priv = this;
+        autcpu12_mtd->owner = THIS_MODULE;
 
         /* Set address of NAND IO lines */
         this->IO_ADDR_R = autcpu12_fio_base;
         this->IO_ADDR_W = autcpu12_fio_base;
-        this->hwcontrol = autcpu12_hwcontrol;
+        this->cmd_ctrl = autcpu12_hwcontrol;
         this->dev_ready = autcpu12_device_ready;
         /* 20 us command delay time */
         this->chip_delay = 20;
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
 
         /* Enable the following for a flash based bad block table */
         /*
-        this->options = NAND_USE_FLASH_BBT;
-        */
+           this->options = NAND_USE_FLASH_BBT;
+         */
         this->options = NAND_USE_FLASH_BBT;
 
         /* Scan to find existance of the device */
-        if (nand_scan (autcpu12_mtd, 1)) {
+        if (nand_scan(autcpu12_mtd, 1)) {
                 err = -ENXIO;
                 goto out_ior;
         }
 
         /* Register the partitions */
-        switch(autcpu12_mtd->size){
-                case SZ_16M: add_mtd_partitions(autcpu12_mtd, partition_info16k, NUM_PARTITIONS16K); break;
-                case SZ_32M: add_mtd_partitions(autcpu12_mtd, partition_info32k, NUM_PARTITIONS32K); break;
-                case SZ_64M: add_mtd_partitions(autcpu12_mtd, partition_info64k, NUM_PARTITIONS64K); break;
-                case SZ_128M: add_mtd_partitions(autcpu12_mtd, partition_info128k, NUM_PARTITIONS128K); break;
-                default: {
-                        printk ("Unsupported SmartMedia device\n");
+        switch (autcpu12_mtd->size) {
+                case SZ_16M:
+                        add_mtd_partitions(autcpu12_mtd, partition_info16k,
+                                           NUM_PARTITIONS16K);
+                        break;
+                case SZ_32M:
+                        add_mtd_partitions(autcpu12_mtd, partition_info32k,
+                                           NUM_PARTITIONS32K);
+                        break;
+                case SZ_64M:
+                        add_mtd_partitions(autcpu12_mtd, partition_info64k,
+                                           NUM_PARTITIONS64K);
+                        break;
+                case SZ_128M:
+                        add_mtd_partitions(autcpu12_mtd, partition_info128k,
+                                           NUM_PARTITIONS128K);
+                        break;
+                default:
+                        printk("Unsupported SmartMedia device\n");
                         err = -ENXIO;
                         goto out_ior;
-                }
         }
         goto out;
 
-out_ior:
-        iounmap((void *)autcpu12_fio_base);
-out_mtd:
-        kfree (autcpu12_mtd);
-out:
+ out_ior:
+        iounmap(autcpu12_fio_base);
+ out_mtd:
+        kfree(autcpu12_mtd);
+ out:
         return err;
 }
 
@@ -204,20 +222,19 @@ module_init(autcpu12_init);
 /*
  * Clean up routine
  */
-#ifdef MODULE
-static void __exit autcpu12_cleanup (void)
+static void __exit autcpu12_cleanup(void)
 {
         /* Release resources, unregister device */
-        nand_release (autcpu12_mtd);
+        nand_release(autcpu12_mtd);
 
         /* unmap physical adress */
-        iounmap((void *)autcpu12_fio_base);
+        iounmap(autcpu12_fio_base);
 
         /* Free the MTD device structure */
-        kfree (autcpu12_mtd);
+        kfree(autcpu12_mtd);
 }
+
 module_exit(autcpu12_cleanup);
-#endif
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>");
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
new file mode 100644
index 000000000000..e0a1d386e581
--- /dev/null
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -0,0 +1,353 @@
+/*
+ * drivers/mtd/nand/cs553x_nand.c
+ *
+ * (C) 2005, 2006 Red Hat Inc.
+ *
+ * Author: David Woodhouse <dwmw2@infradead.org>
+ *         Tom Sylla <tom.sylla@amd.com>
+ *
+ * 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.
+ *
+ *  Overview:
+ *   This is a device driver for the NAND flash controller found on 
+ *   the AMD CS5535/CS5536 companion chipsets for the Geode processor.
+ *
+ */
+
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/pci.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+
+#include <asm/msr.h>
+#include <asm/io.h>
+
+#define NR_CS553X_CONTROLLERS   4
+
+#define MSR_DIVIL_GLD_CAP       0x51400000      /* DIVIL capabilitiies */
+#define CAP_CS5535              0x2df000ULL
+#define CAP_CS5536              0x5df500ULL
+
+/* NAND Timing MSRs */
+#define MSR_NANDF_DATA          0x5140001b      /* NAND Flash Data Timing MSR */
+#define MSR_NANDF_CTL           0x5140001c      /* NAND Flash Control Timing */
+#define MSR_NANDF_RSVD          0x5140001d      /* Reserved */
+
+/* NAND BAR MSRs */
+#define MSR_DIVIL_LBAR_FLSH0    0x51400010      /* Flash Chip Select 0 */
+#define MSR_DIVIL_LBAR_FLSH1    0x51400011      /* Flash Chip Select 1 */
+#define MSR_DIVIL_LBAR_FLSH2    0x51400012      /* Flash Chip Select 2 */
+#define MSR_DIVIL_LBAR_FLSH3    0x51400013      /* Flash Chip Select 3 */
+        /* Each made up of... */
+#define FLSH_LBAR_EN            (1ULL<<32)
+#define FLSH_NOR_NAND           (1ULL<<33)      /* 1 for NAND */
+#define FLSH_MEM_IO             (1ULL<<34)      /* 1 for MMIO */
+        /* I/O BARs have BASE_ADDR in bits 15:4, IO_MASK in 47:36 */
+        /* MMIO BARs have BASE_ADDR in bits 31:12, MEM_MASK in 63:44 */
+
+/* Pin function selection MSR (IDE vs. flash on the IDE pins) */
+#define MSR_DIVIL_BALL_OPTS     0x51400015
+#define PIN_OPT_IDE             (1<<0)  /* 0 for flash, 1 for IDE */
+
+/* Registers within the NAND flash controller BAR -- memory mapped */
+#define MM_NAND_DATA            0x00    /* 0 to 0x7ff, in fact */
+#define MM_NAND_CTL             0x800   /* Any even address 0x800-0x80e */
+#define MM_NAND_IO              0x801   /* Any odd address 0x801-0x80f */
+#define MM_NAND_STS             0x810
+#define MM_NAND_ECC_LSB         0x811
+#define MM_NAND_ECC_MSB         0x812
+#define MM_NAND_ECC_COL         0x813
+#define MM_NAND_LAC             0x814
+#define MM_NAND_ECC_CTL         0x815
+
+/* Registers within the NAND flash controller BAR -- I/O mapped */
+#define IO_NAND_DATA            0x00    /* 0 to 3, in fact */
+#define IO_NAND_CTL             0x04
+#define IO_NAND_IO              0x05
+#define IO_NAND_STS             0x06
+#define IO_NAND_ECC_CTL         0x08
+#define IO_NAND_ECC_LSB         0x09
+#define IO_NAND_ECC_MSB         0x0a
+#define IO_NAND_ECC_COL         0x0b
+#define IO_NAND_LAC             0x0c
+
+#define CS_NAND_CTL_DIST_EN     (1<<4)  /* Enable NAND Distract interrupt */
+#define CS_NAND_CTL_RDY_INT_MASK        (1<<3)  /* Enable RDY/BUSY# interrupt */
+#define CS_NAND_CTL_ALE         (1<<2)
+#define CS_NAND_CTL_CLE         (1<<1)
+#define CS_NAND_CTL_CE          (1<<0)  /* Keep low; 1 to reset */
+
+#define CS_NAND_STS_FLASH_RDY   (1<<3)
+#define CS_NAND_CTLR_BUSY       (1<<2)
+#define CS_NAND_CMD_COMP        (1<<1)
+#define CS_NAND_DIST_ST         (1<<0)
+
+#define CS_NAND_ECC_PARITY      (1<<2)
+#define CS_NAND_ECC_CLRECC      (1<<1)
+#define CS_NAND_ECC_ENECC       (1<<0)
+
+static void cs553x_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+{
+        struct nand_chip *this = mtd->priv;
+
+        while (unlikely(len > 0x800)) {
+                memcpy_fromio(buf, this->IO_ADDR_R, 0x800);
+                buf += 0x800;
+                len -= 0x800;
+        }
+        memcpy_fromio(buf, this->IO_ADDR_R, len);
+}
+
+static void cs553x_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
+{
+        struct nand_chip *this = mtd->priv;
+
+        while (unlikely(len > 0x800)) {
+                memcpy_toio(this->IO_ADDR_R, buf, 0x800);
+                buf += 0x800;
+                len -= 0x800;
+        }
+        memcpy_toio(this->IO_ADDR_R, buf, len);
+}
+
+static unsigned char cs553x_read_byte(struct mtd_info *mtd)
+{
+        struct nand_chip *this = mtd->priv;
+        return readb(this->IO_ADDR_R);
+}
+
+static void cs553x_write_byte(struct mtd_info *mtd, u_char byte)
+{
+        struct nand_chip *this = mtd->priv;
+        int i = 100000;
+
+        while (i && readb(this->IO_ADDR_R + MM_NAND_STS) & CS_NAND_CTLR_BUSY) {
+                udelay(1);
+                i--;
+        }
+        writeb(byte, this->IO_ADDR_W + 0x801);
+}
+
+static void cs553x_hwcontrol(struct mtd_info *mtd, int cmd,
+                             unsigned int ctrl)
+{
+        struct nand_chip *this = mtd->priv;
+        void __iomem *mmio_base = this->IO_ADDR_R;
+        if (ctrl & NAND_CTRL_CHANGE) {
+                unsigned char ctl = (ctrl & ~NAND_CTRL_CHANGE ) ^ 0x01;
+                writeb(ctl, mmio_base + MM_NAND_CTL);
+        }
+        if (cmd != NAND_CMD_NONE)
+                cs553x_write_byte(mtd, cmd);
+}
+
+static int cs553x_device_ready(struct mtd_info *mtd)
+{
+        struct nand_chip *this = mtd->priv;
+        void __iomem *mmio_base = this->IO_ADDR_R;
+        unsigned char foo = readb(mmio_base + MM_NAND_STS);
+
+        return (foo & CS_NAND_STS_FLASH_RDY) && !(foo & CS_NAND_CTLR_BUSY);
+}
+
+static void cs_enable_hwecc(struct mtd_info *mtd, int mode)
+{
+        struct nand_chip *this = mtd->priv;
+        void __iomem *mmio_base = this->IO_ADDR_R;
+
+        writeb(0x07, mmio_base + MM_NAND_ECC_CTL);
+}
+
+static int cs_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
+{
+        uint32_t ecc;
+        struct nand_chip *this = mtd->priv;
+        void __iomem *mmio_base = this->IO_ADDR_R;
+
+        ecc = readl(mmio_base + MM_NAND_STS);
+
+        ecc_code[1] = ecc >> 8;
+        ecc_code[0] = ecc >> 16;
+        ecc_code[2] = ecc >> 24;
+        return 0;
+}
+
+static struct mtd_info *cs553x_mtd[4];
+
+static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
+{
+        int err = 0;
+        struct nand_chip *this;
+        struct mtd_info *new_mtd;
+
+        printk(KERN_NOTICE "Probing CS553x NAND controller CS#%d at %sIO 0x%08lx\n", cs, mmio?"MM":"P", adr);
+
+        if (!mmio) {
+                printk(KERN_NOTICE "PIO mode not yet implemented for CS553X NAND controller\n");
+                return -ENXIO;
+        }
+
+        /* Allocate memory for MTD device structure and private data */
+        new_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
+        if (!new_mtd) {
+                printk(KERN_WARNING "Unable to allocate CS553X NAND MTD device structure.\n");
+                err = -ENOMEM;
+                goto out;
+        }
+
+        /* Get pointer to private data */
+        this = (struct nand_chip *)(&new_mtd[1]);
+
+        /* Initialize structures */
+        memset(new_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
+
+        /* Link the private data with the MTD structure */
+        new_mtd->priv = this;
+        new_mtd->owner = THIS_MODULE;
+
+        /* map physical address */
+        this->IO_ADDR_R = this->IO_ADDR_W = ioremap(adr, 4096);
+        if (!this->IO_ADDR_R) {
+                printk(KERN_WARNING "ioremap cs553x NAND @0x%08lx failed\n", adr);
+                err = -EIO;
+                goto out_mtd;
+        }
+
+        this->cmd_ctrl = cs553x_hwcontrol;
+        this->dev_ready = cs553x_device_ready;
+        this->read_byte = cs553x_read_byte;
+        this->read_buf = cs553x_read_buf;
+        this->write_buf = cs553x_write_buf;
+
+        this->chip_delay = 0;
+
+        this->ecc.mode = NAND_ECC_HW;
+        this->ecc.size = 256;
+        this->ecc.bytes = 3;
+        this->ecc.hwctl  = cs_enable_hwecc;
+        this->ecc.calculate = cs_calculate_ecc;
+        this->ecc.correct  = nand_correct_data;
+
+        /* Enable the following for a flash based bad block table */
+        this->options = NAND_USE_FLASH_BBT | NAND_NO_AUTOINCR;
+
+        /* Scan to find existance of the device */
+        if (nand_scan(new_mtd, 1)) {
+                err = -ENXIO;
+                goto out_ior;
+        }
+
+        cs553x_mtd[cs] = new_mtd;
+        goto out;
+
+out_ior:
+        iounmap((void *)this->IO_ADDR_R);
+out_mtd:
+        kfree(new_mtd);
+out:
+        return err;
+}
+
+static int is_geode(void)
+{
+        /* These are the CPUs which will have a CS553[56] companion chip */
+        if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
+            boot_cpu_data.x86 == 5 &&
+            boot_cpu_data.x86_model == 10)
+                return 1; /* Geode LX */
+
+        if ((boot_cpu_data.x86_vendor == X86_VENDOR_NSC ||
+             boot_cpu_data.x86_vendor == X86_VENDOR_CYRIX) &&
+            boot_cpu_data.x86 == 5 &&
+            boot_cpu_data.x86_model == 5)
+                return 1; /* Geode GX (née GX2) */
+
+        return 0;
+}
+
+static int __init cs553x_init(void)
+{
+        int err = -ENXIO;
+        int i;
+        uint64_t val;
+
+        /* If the CPU isn't a Geode GX or LX, abort */
+        if (!is_geode())
+                return -ENXIO;
+
+        /* If it doesn't have the CS553[56], abort */
+        rdmsrl(MSR_DIVIL_GLD_CAP, val);
+        val &= ~0xFFULL;
+        if (val != CAP_CS5535 && val != CAP_CS5536)
+                return -ENXIO;
+
+        /* If it doesn't have the NAND controller enabled, abort */
+        rdmsrl(MSR_DIVIL_BALL_OPTS, val);
+        if (val & 1) {
+                printk(KERN_INFO "CS553x NAND controller: Flash I/O not enabled in MSR_DIVIL_BALL_OPTS.\n");
+                return -ENXIO;
+        }
+
+        for (i = 0; i < NR_CS553X_CONTROLLERS; i++) {
+                rdmsrl(MSR_DIVIL_LBAR_FLSH0 + i, val);
+
+                if ((val & (FLSH_LBAR_EN|FLSH_NOR_NAND)) == (FLSH_LBAR_EN|FLSH_NOR_NAND))
+                        err = cs553x_init_one(i, !!(val & FLSH_MEM_IO), val & 0xFFFFFFFF);
+        }
+
+        /* Register all devices together here. This means we can easily hack it to 
+           do mtdconcat etc. if we want to. */
+        for (i = 0; i < NR_CS553X_CONTROLLERS; i++) {
+                if (cs553x_mtd[i]) {
+                        add_mtd_device(cs553x_mtd[i]);
+
+                        /* If any devices registered, return success. Else the last error. */
+                        err = 0;
+                }
+        }
+
+        return err;
+}
+
+module_init(cs553x_init);
+
+static void __exit cs553x_cleanup(void)
+{
+        int i;
+
+        for (i = 0; i < NR_CS553X_CONTROLLERS; i++) {
+                struct mtd_info *mtd = cs553x_mtd[i];
+                struct nand_chip *this;
+                void __iomem *mmio_base;
+
+                if (!mtd)
+                        break;
+
+                this = cs553x_mtd[i]->priv;
+                mmio_base = this->IO_ADDR_R;
+
+                /* Release resources, unregister device */
+                nand_release(cs553x_mtd[i]);
+                cs553x_mtd[i] = NULL;
+
+                /* unmap physical adress */
+                iounmap(mmio_base);
+
+                /* Free the MTD device structure */
+                kfree(mtd);
+        }
+}
+
+module_exit(cs553x_cleanup);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
+MODULE_DESCRIPTION("NAND controller driver for AMD CS5535/CS5536 companion chip");
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index ec5e45e4e4ef..6107f532855b 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -58,10 +58,10 @@ static unsigned long __initdata doc_locations[] = {
         0xe4000000,
 #elif defined(CONFIG_MOMENCO_OCELOT)
         0x2f000000,
-        0xff000000,
+        0xff000000,
 #elif defined(CONFIG_MOMENCO_OCELOT_G) || defined (CONFIG_MOMENCO_OCELOT_C)
-        0xff000000,
-##else
+        0xff000000,
+#else
 #warning Unknown architecture for DiskOnChip. No default probe locations defined
 #endif
         0xffffffff };
@@ -73,7 +73,7 @@ struct doc_priv {
         unsigned long physadr;
         u_char ChipID;
         u_char CDSNControl;
-        int chips_per_floor; /* The number of chips detected on each floor */
+        int chips_per_floor;    /* The number of chips detected on each floor */
         int curfloor;
         int curchip;
         int mh0_page;
@@ -84,6 +84,7 @@ struct doc_priv {
 /* This is the syndrome computed by the HW ecc generator upon reading an empty
    page, one with all 0xff for data and stored ecc code. */
 static u_char empty_read_syndrome[6] = { 0x26, 0xff, 0x6d, 0x47, 0x73, 0x7a };
+
 /* This is the ecc value computed by the HW ecc generator upon writing an empty
    page, one with all 0xff for data. */
 static u_char empty_write_ecc[6] = { 0x4b, 0x00, 0xe2, 0x0e, 0x93, 0xf7 };
@@ -94,28 +95,29 @@ static u_char empty_write_ecc[6] = { 0x4b, 0x00, 0xe2, 0x0e, 0x93, 0xf7 };
 #define DoC_is_Millennium(doc) ((doc)->ChipID == DOC_ChipID_DocMil)
 #define DoC_is_2000(doc) ((doc)->ChipID == DOC_ChipID_Doc2k)
 
-static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd);
+static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd,
+                              unsigned int bitmask);
 static void doc200x_select_chip(struct mtd_info *mtd, int chip);
 
-static int debug=0;
+static int debug = 0;
 module_param(debug, int, 0);
 
-static int try_dword=1;
+static int try_dword = 1;
 module_param(try_dword, int, 0);
 
-static int no_ecc_failures=0;
+static int no_ecc_failures = 0;
 module_param(no_ecc_failures, int, 0);
 
-static int no_autopart=0;
+static int no_autopart = 0;
 module_param(no_autopart, int, 0);
 
-static int show_firmware_partition=0;
+static int show_firmware_partition = 0;
 module_param(show_firmware_partition, int, 0);
 
 #ifdef MTD_NAND_DISKONCHIP_BBTWRITE
-static int inftl_bbt_write=1;
+static int inftl_bbt_write = 1;
 #else
-static int inftl_bbt_write=0;
+static int inftl_bbt_write = 0;
 #endif
 module_param(inftl_bbt_write, int, 0);
 
@@ -123,7 +125,6 @@ static unsigned long doc_config_location = CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDR
 module_param(doc_config_location, ulong, 0);
 MODULE_PARM_DESC(doc_config_location, "Physical memory address at which to probe for DiskOnChip");
 
-
 /* Sector size for HW ECC */
 #define SECTOR_SIZE 512
 /* The sector bytes are packed into NB_DATA 10 bit words */
@@ -147,7 +148,7 @@ static struct rs_control *rs_decoder;
  * some comments, improved a minor bit and converted it to make use
  * of the generic Reed-Solomon libary. tglx
  */
-static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
+static int doc_ecc_decode(struct rs_control *rs, uint8_t *data, uint8_t *ecc)
 {
         int i, j, nerr, errpos[8];
         uint8_t parity;
@@ -168,18 +169,18 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
          *  s[i] = ds[3]x^3 + ds[2]x^2 + ds[1]x^1 + ds[0]
          *  where x = alpha^(FCR + i)
          */
-        for(j = 1; j < NROOTS; j++) {
-                if(ds[j] == 0)
+        for (j = 1; j < NROOTS; j++) {
+                if (ds[j] == 0)
                         continue;
                 tmp = rs->index_of[ds[j]];
-                for(i = 0; i < NROOTS; i++)
+                for (i = 0; i < NROOTS; i++)
                         s[i] ^= rs->alpha_to[rs_modnn(rs, tmp + (FCR + i) * j)];
         }
 
         /* Calc s[i] = s[i] / alpha^(v + i) */
         for (i = 0; i < NROOTS; i++) {
                 if (syn[i])
-                        syn[i] = rs_modnn(rs, rs->index_of[s[i]] + (NN - FCR - i));
+                        syn[i] = rs_modnn(rs, rs->index_of[s[i]] + (NN - FCR - i));
         }
         /* Call the decoder library */
         nerr = decode_rs16(rs, NULL, NULL, 1019, syn, 0, errpos, 0, errval);
@@ -193,7 +194,7 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
          * but they are given by the design of the de/encoder circuit
          * in the DoC ASIC's.
          */
-        for(i = 0;i < nerr; i++) {
+        for (i = 0; i < nerr; i++) {
                 int index, bitpos, pos = 1015 - errpos[i];
                 uint8_t val;
                 if (pos >= NB_DATA && pos < 1019)
@@ -205,8 +206,7 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
                            can be modified since pos is even */
                         index = (pos >> 3) ^ 1;
                         bitpos = pos & 7;
-                        if ((index >= 0 && index < SECTOR_SIZE) ||
-                            index == (SECTOR_SIZE + 1)) {
+                        if ((index >= 0 && index < SECTOR_SIZE) || index == (SECTOR_SIZE + 1)) {
                                 val = (uint8_t) (errval[i] >> (2 + bitpos));
                                 parity ^= val;
                                 if (index < SECTOR_SIZE)
@@ -216,9 +216,8 @@ static int doc_ecc_decode (struct rs_control *rs, uint8_t *data, uint8_t *ecc)
                         bitpos = (bitpos + 10) & 7;
                         if (bitpos == 0)
                                 bitpos = 8;
-                        if ((index >= 0 && index < SECTOR_SIZE) ||
-                            index == (SECTOR_SIZE + 1)) {
-                                val = (uint8_t)(errval[i] << (8 - bitpos));
+                        if ((index >= 0 && index < SECTOR_SIZE) || index == (SECTOR_SIZE + 1)) {
+                                val = (uint8_t) (errval[i] << (8 - bitpos));
                                 parity ^= val;
                                 if (index < SECTOR_SIZE)
                                         data[index] ^= val;
@@ -250,10 +249,11 @@ static void DoC_Delay(struct doc_priv *doc, unsigned short cycles)
 /* DOC_WaitReady: Wait for RDY line to be asserted by the flash chip */
 static int _DoC_WaitReady(struct doc_priv *doc)
 {
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         unsigned long timeo = jiffies + (HZ * 10);
 
-        if(debug) printk("_DoC_WaitReady...\n");
+        if (debug)
+                printk("_DoC_WaitReady...\n");
         /* Out-of-line routine to wait for chip response */
         if (DoC_is_MillenniumPlus(doc)) {
                 while ((ReadDOC(docptr, Mplus_FlashControl) & CDSN_CTRL_FR_B_MASK) != CDSN_CTRL_FR_B_MASK) {
@@ -280,7 +280,7 @@ static int _DoC_WaitReady(struct doc_priv *doc)
 
 static inline int DoC_WaitReady(struct doc_priv *doc)
 {
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int ret = 0;
 
         if (DoC_is_MillenniumPlus(doc)) {
@@ -298,7 +298,8 @@ static inline int DoC_WaitReady(struct doc_priv *doc)
                 DoC_Delay(doc, 2);
         }
 
-        if(debug) printk("DoC_WaitReady OK\n");
+        if (debug)
+                printk("DoC_WaitReady OK\n");
         return ret;
 }
 
@@ -306,9 +307,10 @@ static void doc2000_write_byte(struct mtd_info *mtd, u_char datum)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
-        if(debug)printk("write_byte %02x\n", datum);
+        if (debug)
+                printk("write_byte %02x\n", datum);
         WriteDOC(datum, docptr, CDSNSlowIO);
         WriteDOC(datum, docptr, 2k_CDSN_IO);
 }
@@ -317,77 +319,78 @@ static u_char doc2000_read_byte(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         u_char ret;
 
         ReadDOC(docptr, CDSNSlowIO);
         DoC_Delay(doc, 2);
         ret = ReadDOC(docptr, 2k_CDSN_IO);
-        if (debug) printk("read_byte returns %02x\n", ret);
+        if (debug)
+                printk("read_byte returns %02x\n", ret);
         return ret;
 }
 
-static void doc2000_writebuf(struct mtd_info *mtd,
-                             const u_char *buf, int len)
+static void doc2000_writebuf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
-        if (debug)printk("writebuf of %d bytes: ", len);
-        for (i=0; i < len; i++) {
+        if (debug)
+                printk("writebuf of %d bytes: ", len);
+        for (i = 0; i < len; i++) {
                 WriteDOC_(buf[i], docptr, DoC_2k_CDSN_IO + i);
                 if (debug && i < 16)
                         printk("%02x ", buf[i]);
         }
-        if (debug) printk("\n");
+        if (debug)
+                printk("\n");
 }
 
-static void doc2000_readbuf(struct mtd_info *mtd,
-                            u_char *buf, int len)
+static void doc2000_readbuf(struct mtd_info *mtd, u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
-        int i;
+        void __iomem *docptr = doc->virtadr;
+        int i;
 
-        if (debug)printk("readbuf of %d bytes: ", len);
+        if (debug)
+                printk("readbuf of %d bytes: ", len);
 
-        for (i=0; i < len; i++) {
+        for (i = 0; i < len; i++) {
                 buf[i] = ReadDOC(docptr, 2k_CDSN_IO + i);
         }
 }
 
-static void doc2000_readbuf_dword(struct mtd_info *mtd,
-                            u_char *buf, int len)
+static void doc2000_readbuf_dword(struct mtd_info *mtd, u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
-        int i;
+        void __iomem *docptr = doc->virtadr;
+        int i;
 
-        if (debug) printk("readbuf_dword of %d bytes: ", len);
+        if (debug)
+                printk("readbuf_dword of %d bytes: ", len);
 
-        if (unlikely((((unsigned long)buf)|len) & 3)) {
-                for (i=0; i < len; i++) {
-                        *(uint8_t *)(&buf[i]) = ReadDOC(docptr, 2k_CDSN_IO + i);
+        if (unlikely((((unsigned long)buf) | len) & 3)) {
+                for (i = 0; i < len; i++) {
+                        *(uint8_t *) (&buf[i]) = ReadDOC(docptr, 2k_CDSN_IO + i);
                 }
         } else {
-                for (i=0; i < len; i+=4) {
-                        *(uint32_t*)(&buf[i]) = readl(docptr + DoC_2k_CDSN_IO + i);
+                for (i = 0; i < len; i += 4) {
+                        *(uint32_t *) (&buf[i]) = readl(docptr + DoC_2k_CDSN_IO + i);
                 }
         }
 }
 
-static int doc2000_verifybuf(struct mtd_info *mtd,
-                              const u_char *buf, int len)
+static int doc2000_verifybuf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
 
-        for (i=0; i < len; i++)
+        for (i = 0; i < len; i++)
                 if (buf[i] != ReadDOC(docptr, 2k_CDSN_IO))
                         return -EFAULT;
         return 0;
@@ -400,12 +403,10 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
         uint16_t ret;
 
         doc200x_select_chip(mtd, nr);
-        doc200x_hwcontrol(mtd, NAND_CTL_SETCLE);
-        this->write_byte(mtd, NAND_CMD_READID);
-        doc200x_hwcontrol(mtd, NAND_CTL_CLRCLE);
-        doc200x_hwcontrol(mtd, NAND_CTL_SETALE);
-        this->write_byte(mtd, 0);
-        doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);
+        doc200x_hwcontrol(mtd, NAND_CMD_READID,
+                          NAND_CTRL_CLE | NAND_CTRL_CHANGE);
+        doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE);
+        doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
 
         /* We cant' use dev_ready here, but at least we wait for the
          * command to complete
@@ -423,12 +424,11 @@ static uint16_t __init doc200x_ident_chip(struct mtd_info *mtd, int nr)
                 } ident;
                 void __iomem *docptr = doc->virtadr;
 
-                doc200x_hwcontrol(mtd, NAND_CTL_SETCLE);
-                doc2000_write_byte(mtd, NAND_CMD_READID);
-                doc200x_hwcontrol(mtd, NAND_CTL_CLRCLE);
-                doc200x_hwcontrol(mtd, NAND_CTL_SETALE);
-                doc2000_write_byte(mtd, 0);
-                doc200x_hwcontrol(mtd, NAND_CTL_CLRALE);
+                doc200x_hwcontrol(mtd, NAND_CMD_READID,
+                                  NAND_CTRL_CLE | NAND_CTRL_CHANGE);
+                doc200x_hwcontrol(mtd, 0, NAND_CTRL_ALE | NAND_CTRL_CHANGE);
+                doc200x_hwcontrol(mtd, NAND_CMD_NONE,
+                                  NAND_NCE | NAND_CTRL_CHANGE);
 
                 udelay(50);
 
@@ -464,7 +464,7 @@ static void __init doc2000_count_chips(struct mtd_info *mtd)
         printk(KERN_DEBUG "Detected %d chips per floor.\n", i);
 }
 
-static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
+static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this)
 {
         struct doc_priv *doc = this->priv;
 
@@ -482,7 +482,7 @@ static void doc2001_write_byte(struct mtd_info *mtd, u_char datum)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
         WriteDOC(datum, docptr, CDSNSlowIO);
         WriteDOC(datum, docptr, Mil_CDSN_IO);
@@ -493,7 +493,7 @@ static u_char doc2001_read_byte(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
         //ReadDOC(docptr, CDSNSlowIO);
         /* 11.4.5 -- delay twice to allow extended length cycle */
@@ -503,50 +503,47 @@ static u_char doc2001_read_byte(struct mtd_info *mtd)
         return ReadDOC(docptr, LastDataRead);
 }
 
-static void doc2001_writebuf(struct mtd_info *mtd,
-                             const u_char *buf, int len)
+static void doc2001_writebuf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
 
-        for (i=0; i < len; i++)
+        for (i = 0; i < len; i++)
                 WriteDOC_(buf[i], docptr, DoC_Mil_CDSN_IO + i);
         /* Terminate write pipeline */
         WriteDOC(0x00, docptr, WritePipeTerm);
 }
 
-static void doc2001_readbuf(struct mtd_info *mtd,
-                            u_char *buf, int len)
+static void doc2001_readbuf(struct mtd_info *mtd, u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
 
         /* Start read pipeline */
         ReadDOC(docptr, ReadPipeInit);
 
-        for (i=0; i < len-1; i++)
+        for (i = 0; i < len - 1; i++)
                 buf[i] = ReadDOC(docptr, Mil_CDSN_IO + (i & 0xff));
 
         /* Terminate read pipeline */
         buf[i] = ReadDOC(docptr, LastDataRead);
 }
 
-static int doc2001_verifybuf(struct mtd_info *mtd,
-                             const u_char *buf, int len)
+static int doc2001_verifybuf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
 
         /* Start read pipeline */
         ReadDOC(docptr, ReadPipeInit);
 
-        for (i=0; i < len-1; i++)
+        for (i = 0; i < len - 1; i++)
                 if (buf[i] != ReadDOC(docptr, Mil_CDSN_IO)) {
                         ReadDOC(docptr, LastDataRead);
                         return i;
@@ -560,87 +557,90 @@ static u_char doc2001plus_read_byte(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         u_char ret;
 
-        ReadDOC(docptr, Mplus_ReadPipeInit);
-        ReadDOC(docptr, Mplus_ReadPipeInit);
-        ret = ReadDOC(docptr, Mplus_LastDataRead);
-        if (debug) printk("read_byte returns %02x\n", ret);
+        ReadDOC(docptr, Mplus_ReadPipeInit);
+        ReadDOC(docptr, Mplus_ReadPipeInit);
+        ret = ReadDOC(docptr, Mplus_LastDataRead);
+        if (debug)
+                printk("read_byte returns %02x\n", ret);
         return ret;
 }
 
-static void doc2001plus_writebuf(struct mtd_info *mtd,
-                             const u_char *buf, int len)
+static void doc2001plus_writebuf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
 
-        if (debug)printk("writebuf of %d bytes: ", len);
-        for (i=0; i < len; i++) {
+        if (debug)
+                printk("writebuf of %d bytes: ", len);
+        for (i = 0; i < len; i++) {
                 WriteDOC_(buf[i], docptr, DoC_Mil_CDSN_IO + i);
                 if (debug && i < 16)
                         printk("%02x ", buf[i]);
         }
-        if (debug) printk("\n");
+        if (debug)
+                printk("\n");
 }
 
-static void doc2001plus_readbuf(struct mtd_info *mtd,
-                            u_char *buf, int len)
+static void doc2001plus_readbuf(struct mtd_info *mtd, u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
 
-        if (debug)printk("readbuf of %d bytes: ", len);
+        if (debug)
+                printk("readbuf of %d bytes: ", len);
 
         /* Start read pipeline */
         ReadDOC(docptr, Mplus_ReadPipeInit);
         ReadDOC(docptr, Mplus_ReadPipeInit);
 
-        for (i=0; i < len-2; i++) {
+        for (i = 0; i < len - 2; i++) {
                 buf[i] = ReadDOC(docptr, Mil_CDSN_IO);
                 if (debug && i < 16)
                         printk("%02x ", buf[i]);
         }
 
         /* Terminate read pipeline */
-        buf[len-2] = ReadDOC(docptr, Mplus_LastDataRead);
+        buf[len - 2] = ReadDOC(docptr, Mplus_LastDataRead);
         if (debug && i < 16)
-                printk("%02x ", buf[len-2]);
-        buf[len-1] = ReadDOC(docptr, Mplus_LastDataRead);
+                printk("%02x ", buf[len - 2]);
+        buf[len - 1] = ReadDOC(docptr, Mplus_LastDataRead);
         if (debug && i < 16)
-                printk("%02x ", buf[len-1]);
-        if (debug) printk("\n");
+                printk("%02x ", buf[len - 1]);
+        if (debug)
+                printk("\n");
 }
 
-static int doc2001plus_verifybuf(struct mtd_info *mtd,
-                             const u_char *buf, int len)
+static int doc2001plus_verifybuf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
 
-        if (debug)printk("verifybuf of %d bytes: ", len);
+        if (debug)
+                printk("verifybuf of %d bytes: ", len);
 
         /* Start read pipeline */
         ReadDOC(docptr, Mplus_ReadPipeInit);
         ReadDOC(docptr, Mplus_ReadPipeInit);
 
-        for (i=0; i < len-2; i++)
+        for (i = 0; i < len - 2; i++)
                 if (buf[i] != ReadDOC(docptr, Mil_CDSN_IO)) {
                         ReadDOC(docptr, Mplus_LastDataRead);
                         ReadDOC(docptr, Mplus_LastDataRead);
                         return i;
                 }
-        if (buf[len-2] != ReadDOC(docptr, Mplus_LastDataRead))
-                return len-2;
-        if (buf[len-1] != ReadDOC(docptr, Mplus_LastDataRead))
-                return len-1;
+        if (buf[len - 2] != ReadDOC(docptr, Mplus_LastDataRead))
+                return len - 2;
+        if (buf[len - 1] != ReadDOC(docptr, Mplus_LastDataRead))
+                return len - 1;
         return 0;
 }
 
@@ -648,10 +648,11 @@ static void doc2001plus_select_chip(struct mtd_info *mtd, int chip)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int floor = 0;
 
-        if(debug)printk("select chip (%d)\n", chip);
+        if (debug)
+                printk("select chip (%d)\n", chip);
 
         if (chip == -1) {
                 /* Disable flash internally */
@@ -660,7 +661,7 @@ static void doc2001plus_select_chip(struct mtd_info *mtd, int chip)
         }
 
         floor = chip / doc->chips_per_floor;
-        chip -= (floor *  doc->chips_per_floor);
+        chip -= (floor * doc->chips_per_floor);
 
         /* Assert ChipEnable and deassert WriteProtect */
         WriteDOC((DOC_FLASH_CE), docptr, Mplus_FlashSelect);
@@ -674,72 +675,61 @@ static void doc200x_select_chip(struct mtd_info *mtd, int chip)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int floor = 0;
 
-        if(debug)printk("select chip (%d)\n", chip);
+        if (debug)
+                printk("select chip (%d)\n", chip);
 
         if (chip == -1)
                 return;
 
         floor = chip / doc->chips_per_floor;
-        chip -= (floor *  doc->chips_per_floor);
+        chip -= (floor * doc->chips_per_floor);
 
         /* 11.4.4 -- deassert CE before changing chip */
-        doc200x_hwcontrol(mtd, NAND_CTL_CLRNCE);
+        doc200x_hwcontrol(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);
 
         WriteDOC(floor, docptr, FloorSelect);
         WriteDOC(chip, docptr, CDSNDeviceSelect);
 
-        doc200x_hwcontrol(mtd, NAND_CTL_SETNCE);
+        doc200x_hwcontrol(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
 
         doc->curchip = chip;
         doc->curfloor = floor;
 }
 
-static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd)
+#define CDSN_CTRL_MSK (CDSN_CTRL_CE | CDSN_CTRL_CLE | CDSN_CTRL_ALE)
+
+static void doc200x_hwcontrol(struct mtd_info *mtd, int cmd,
+                              unsigned int ctrl)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
-        switch(cmd) {
-        case NAND_CTL_SETNCE:
-                doc->CDSNControl |= CDSN_CTRL_CE;
-                break;
-        case NAND_CTL_CLRNCE:
-                doc->CDSNControl &= ~CDSN_CTRL_CE;
-                break;
-        case NAND_CTL_SETCLE:
-                doc->CDSNControl |= CDSN_CTRL_CLE;
-                break;
-        case NAND_CTL_CLRCLE:
-                doc->CDSNControl &= ~CDSN_CTRL_CLE;
-                break;
-        case NAND_CTL_SETALE:
-                doc->CDSNControl |= CDSN_CTRL_ALE;
-                break;
-        case NAND_CTL_CLRALE:
-                doc->CDSNControl &= ~CDSN_CTRL_ALE;
-                break;
-        case NAND_CTL_SETWP:
-                doc->CDSNControl |= CDSN_CTRL_WP;
-                break;
-        case NAND_CTL_CLRWP:
-                doc->CDSNControl &= ~CDSN_CTRL_WP;
-                break;
+        if (ctrl & NAND_CTRL_CHANGE) {
+                doc->CDSNControl &= ~CDSN_CTRL_MSK;
+                doc->CDSNControl |= ctrl & CDSN_CTRL_MSK;
+                if (debug)
+                        printk("hwcontrol(%d): %02x\n", cmd, doc->CDSNControl);
+                WriteDOC(doc->CDSNControl, docptr, CDSNControl);
+                /* 11.4.3 -- 4 NOPs after CSDNControl write */
+                DoC_Delay(doc, 4);
+        }
+        if (cmd != NAND_CMD_NONE) {
+                if (DoC_is_2000(doc))
+                        doc2000_write_byte(mtd, cmd);
+                else
+                        doc2001_write_byte(mtd, cmd);
         }
-        if (debug)printk("hwcontrol(%d): %02x\n", cmd, doc->CDSNControl);
-        WriteDOC(doc->CDSNControl, docptr, CDSNControl);
-        /* 11.4.3 -- 4 NOPs after CSDNControl write */
-        DoC_Delay(doc, 4);
 }
 
-static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int column, int page_addr)
+static void doc2001plus_command(struct mtd_info *mtd, unsigned command, int column, int page_addr)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
         /*
          * Must terminate write pipeline before sending any commands
@@ -756,9 +746,9 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col
         if (command == NAND_CMD_SEQIN) {
                 int readcmd;
 
-                if (column >= mtd->oobblock) {
+                if (column >= mtd->writesize) {
                         /* OOB area */
-                        column -= mtd->oobblock;
+                        column -= mtd->writesize;
                         readcmd = NAND_CMD_READOOB;
                 } else if (column < 256) {
                         /* First 256 bytes --> READ0 */
@@ -782,25 +772,26 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col
                         WriteDOC(column, docptr, Mplus_FlashAddress);
                 }
                 if (page_addr != -1) {
-                        WriteDOC((unsigned char) (page_addr & 0xff), docptr, Mplus_FlashAddress);
-                        WriteDOC((unsigned char) ((page_addr >> 8) & 0xff), docptr, Mplus_FlashAddress);
+                        WriteDOC((unsigned char)(page_addr & 0xff), docptr, Mplus_FlashAddress);
+                        WriteDOC((unsigned char)((page_addr >> 8) & 0xff), docptr, Mplus_FlashAddress);
                         /* One more address cycle for higher density devices */
                         if (this->chipsize & 0x0c000000) {
-                                WriteDOC((unsigned char) ((page_addr >> 16) & 0x0f), docptr, Mplus_FlashAddress);
+                                WriteDOC((unsigned char)((page_addr >> 16) & 0x0f), docptr, Mplus_FlashAddress);
                                 printk("high density\n");
                         }
                 }
                 WriteDOC(0, docptr, Mplus_WritePipeTerm);
                 WriteDOC(0, docptr, Mplus_WritePipeTerm);
                 /* deassert ALE */
-                if (command == NAND_CMD_READ0 || command == NAND_CMD_READ1 || command == NAND_CMD_READOOB || command == NAND_CMD_READID)
+                if (command == NAND_CMD_READ0 || command == NAND_CMD_READ1 ||
+                    command == NAND_CMD_READOOB || command == NAND_CMD_READID)
                         WriteDOC(0, docptr, Mplus_FlashControl);
         }
 
         /*
          * program and erase have their own busy handlers
          * status and sequential in needs no delay
-        */
+         */
         switch (command) {
 
         case NAND_CMD_PAGEPROG:
@@ -817,55 +808,57 @@ static void doc2001plus_command (struct mtd_info *mtd, unsigned command, int col
                 WriteDOC(NAND_CMD_STATUS, docptr, Mplus_FlashCmd);
                 WriteDOC(0, docptr, Mplus_WritePipeTerm);
                 WriteDOC(0, docptr, Mplus_WritePipeTerm);
-                while ( !(this->read_byte(mtd) & 0x40));
+                while (!(this->read_byte(mtd) & 0x40)) ;
                 return;
 
-        /* This applies to read commands */
+                /* This applies to read commands */
         default:
                 /*
                  * If we don't have access to the busy pin, we apply the given
                  * command delay
-                */
+                 */
                 if (!this->dev_ready) {
-                        udelay (this->chip_delay);
+                        udelay(this->chip_delay);
                         return;
                 }
         }
 
         /* Apply this short delay always to ensure that we do wait tWB in
          * any case on any machine. */
-        ndelay (100);
+        ndelay(100);
         /* wait until command is processed */
-        while (!this->dev_ready(mtd));
+        while (!this->dev_ready(mtd)) ;
 }
 
 static int doc200x_dev_ready(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
         if (DoC_is_MillenniumPlus(doc)) {
                 /* 11.4.2 -- must NOP four times before checking FR/B# */
                 DoC_Delay(doc, 4);
                 if ((ReadDOC(docptr, Mplus_FlashControl) & CDSN_CTRL_FR_B_MASK) != CDSN_CTRL_FR_B_MASK) {
-                        if(debug)
+                        if (debug)
                                 printk("not ready\n");
                         return 0;
                 }
-                if (debug)printk("was ready\n");
+                if (debug)
+                        printk("was ready\n");
                 return 1;
         } else {
                 /* 11.4.2 -- must NOP four times before checking FR/B# */
                 DoC_Delay(doc, 4);
                 if (!(ReadDOC(docptr, CDSNControl) & CDSN_CTRL_FR_B)) {
-                        if(debug)
+                        if (debug)
                                 printk("not ready\n");
                         return 0;
                 }
                 /* 11.4.2 -- Must NOP twice if it's ready */
                 DoC_Delay(doc, 2);
-                if (debug)printk("was ready\n");
+                if (debug)
+                        printk("was ready\n");
                 return 1;
         }
 }
@@ -881,10 +874,10 @@ static void doc200x_enable_hwecc(struct mtd_info *mtd, int mode)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
         /* Prime the ECC engine */
-        switch(mode) {
+        switch (mode) {
         case NAND_ECC_READ:
                 WriteDOC(DOC_ECC_RESET, docptr, ECCConf);
                 WriteDOC(DOC_ECC_EN, docptr, ECCConf);
@@ -900,10 +893,10 @@ static void doc2001plus_enable_hwecc(struct mtd_info *mtd, int mode)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
 
         /* Prime the ECC engine */
-        switch(mode) {
+        switch (mode) {
         case NAND_ECC_READ:
                 WriteDOC(DOC_ECC_RESET, docptr, Mplus_ECCConf);
                 WriteDOC(DOC_ECC_EN, docptr, Mplus_ECCConf);
@@ -916,12 +909,11 @@ static void doc2001plus_enable_hwecc(struct mtd_info *mtd, int mode)
 }
 
 /* This code is only called on write */
-static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
-                                 unsigned char *ecc_code)
+static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat, unsigned char *ecc_code)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
         int i;
         int emptymatch = 1;
 
@@ -961,7 +953,8 @@ static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
                    often.  It could be optimized away by examining the data in
                    the writebuf routine, and remembering the result. */
                 for (i = 0; i < 512; i++) {
-                        if (dat[i] == 0xff) continue;
+                        if (dat[i] == 0xff)
+                                continue;
                         emptymatch = 0;
                         break;
                 }
@@ -969,17 +962,20 @@ static int doc200x_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
         /* If emptymatch still =1, we do have an all-0xff data buffer.
            Return all-0xff ecc value instead of the computed one, so
            it'll look just like a freshly-erased page. */
-        if (emptymatch) memset(ecc_code, 0xff, 6);
+        if (emptymatch)
+                memset(ecc_code, 0xff, 6);
 #endif
         return 0;
 }
 
-static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)
+static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat,
+                                u_char *read_ecc, u_char *isnull)
 {
         int i, ret = 0;
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
-        void __iomem *docptr = doc->virtadr;
+        void __iomem *docptr = doc->virtadr;
+        uint8_t calc_ecc[6];
         volatile u_char dummy;
         int emptymatch = 1;
 
@@ -1012,18 +1008,20 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
                    all-0xff data and stored ecc block.  Check the stored ecc. */
                 if (emptymatch) {
                         for (i = 0; i < 6; i++) {
-                                if (read_ecc[i] == 0xff) continue;
+                                if (read_ecc[i] == 0xff)
+                                        continue;
                                 emptymatch = 0;
                                 break;
                         }
                 }
                 /* If emptymatch still =1, check the data block. */
                 if (emptymatch) {
-                /* Note: this somewhat expensive test should not be triggered
-                   often.  It could be optimized away by examining the data in
-                   the readbuf routine, and remembering the result. */
+                        /* Note: this somewhat expensive test should not be triggered
+                           often.  It could be optimized away by examining the data in
+                           the readbuf routine, and remembering the result. */
                         for (i = 0; i < 512; i++) {
-                                if (dat[i] == 0xff) continue;
+                                if (dat[i] == 0xff)
+                                        continue;
                                 emptymatch = 0;
                                 break;
                         }
@@ -1032,7 +1030,8 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
                    erased block, in which case the ECC will not come out right.
                    We'll suppress the error and tell the caller everything's
                    OK.  Because it is. */
-                if (!emptymatch) ret = doc_ecc_decode (rs_decoder, dat, calc_ecc);
+                if (!emptymatch)
+                        ret = doc_ecc_decode(rs_decoder, dat, calc_ecc);
                 if (ret > 0)
                         printk(KERN_ERR "doc200x_correct_data corrected %d errors\n", ret);
         }
@@ -1059,11 +1058,10 @@ static int doc200x_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_
  * safer.  The only problem with it is that any code that parses oobfree must
  * be able to handle out-of-order segments.
  */
-static struct nand_oobinfo doc200x_oobinfo = {
-        .useecc = MTD_NANDECC_AUTOPLACE,
-        .eccbytes = 6,
-        .eccpos = {0, 1, 2, 3, 4, 5},
-        .oobfree = { {8, 8}, {6, 2} }
+static struct nand_ecclayout doc200x_oobinfo = {
+        .eccbytes = 6,
+        .eccpos = {0, 1, 2, 3, 4, 5},
+        .oobfree = {{8, 8}, {6, 2}}
 };
 
 /* Find the (I)NFTL Media Header, and optionally also the mirror media header.
@@ -1072,8 +1070,7 @@ static struct nand_oobinfo doc200x_oobinfo = {
    either "ANAND" or "BNAND".  If findmirror=1, also look for the mirror media
    header.  The page #s of the found media headers are placed in mh0_page and
    mh1_page in the DOC private structure. */
-static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,
-                                     const char *id, int findmirror)
+static int __init find_media_headers(struct mtd_info *mtd, u_char *buf, const char *id, int findmirror)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
@@ -1082,17 +1079,19 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,
         size_t retlen;
 
         for (offs = 0; offs < mtd->size; offs += mtd->erasesize) {
-                ret = mtd->read(mtd, offs, mtd->oobblock, &retlen, buf);
-                if (retlen != mtd->oobblock) continue;
+                ret = mtd->read(mtd, offs, mtd->writesize, &retlen, buf);
+                if (retlen != mtd->writesize)
+                        continue;
                 if (ret) {
-                        printk(KERN_WARNING "ECC error scanning DOC at 0x%x\n",
-                                offs);
+                        printk(KERN_WARNING "ECC error scanning DOC at 0x%x\n", offs);
                 }
-                if (memcmp(buf, id, 6)) continue;
+                if (memcmp(buf, id, 6))
+                        continue;
                 printk(KERN_INFO "Found DiskOnChip %s Media Header at 0x%x\n", id, offs);
                 if (doc->mh0_page == -1) {
                         doc->mh0_page = offs >> this->page_shift;
-                        if (!findmirror) return 1;
+                        if (!findmirror)
+                                return 1;
                         continue;
                 }
                 doc->mh1_page = offs >> this->page_shift;
@@ -1105,8 +1104,8 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,
         /* Only one mediaheader was found.  We want buf to contain a
            mediaheader on return, so we'll have to re-read the one we found. */
         offs = doc->mh0_page << this->page_shift;
-        ret = mtd->read(mtd, offs, mtd->oobblock, &retlen, buf);
-        if (retlen != mtd->oobblock) {
+        ret = mtd->read(mtd, offs, mtd->writesize, &retlen, buf);
+        if (retlen != mtd->writesize) {
                 /* Insanity.  Give up. */
                 printk(KERN_ERR "Read DiskOnChip Media Header once, but can't reread it???\n");
                 return 0;
@@ -1114,8 +1113,7 @@ static int __init find_media_headers(struct mtd_info *mtd, u_char *buf,
         return 1;
 }
 
-static inline int __init nftl_partscan(struct mtd_info *mtd,
-                                struct mtd_partition *parts)
+static inline int __init nftl_partscan(struct mtd_info *mtd, struct mtd_partition *parts)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
@@ -1127,13 +1125,14 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,
         unsigned blocks, maxblocks;
         int offs, numheaders;
 
-        buf = kmalloc(mtd->oobblock, GFP_KERNEL);
+        buf = kmalloc(mtd->writesize, GFP_KERNEL);
         if (!buf) {
                 printk(KERN_ERR "DiskOnChip mediaheader kmalloc failed!\n");
                 return 0;
         }
-        if (!(numheaders=find_media_headers(mtd, buf, "ANAND", 1))) goto out;
-        mh = (struct NFTLMediaHeader *) buf;
+        if (!(numheaders = find_media_headers(mtd, buf, "ANAND", 1)))
+                goto out;
+        mh = (struct NFTLMediaHeader *)buf;
 
         mh->NumEraseUnits = le16_to_cpu(mh->NumEraseUnits);
         mh->FirstPhysicalEUN = le16_to_cpu(mh->FirstPhysicalEUN);
@@ -1155,8 +1154,8 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,
                 /* Auto-determine UnitSizeFactor.  The constraints are:
                    - There can be at most 32768 virtual blocks.
                    - There can be at most (virtual block size - page size)
-                     virtual blocks (because MediaHeader+BBT must fit in 1).
-                */
+                   virtual blocks (because MediaHeader+BBT must fit in 1).
+                 */
                 mh->UnitSizeFactor = 0xff;
                 while (blocks > maxblocks) {
                         blocks >>= 1;
@@ -1211,14 +1210,13 @@ static inline int __init nftl_partscan(struct mtd_info *mtd,
         }
 
         ret = numparts;
-out:
+ out:
         kfree(buf);
         return ret;
 }
 
 /* This is a stripped-down copy of the code in inftlmount.c */
-static inline int __init inftl_partscan(struct mtd_info *mtd,
-                                 struct mtd_partition *parts)
+static inline int __init inftl_partscan(struct mtd_info *mtd, struct mtd_partition *parts)
 {
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
@@ -1235,15 +1233,16 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
         if (inftl_bbt_write)
                 end -= (INFTL_BBT_RESERVED_BLOCKS << this->phys_erase_shift);
 
-        buf = kmalloc(mtd->oobblock, GFP_KERNEL);
+        buf = kmalloc(mtd->writesize, GFP_KERNEL);
         if (!buf) {
                 printk(KERN_ERR "DiskOnChip mediaheader kmalloc failed!\n");
                 return 0;
         }
 
-        if (!find_media_headers(mtd, buf, "BNAND", 0)) goto out;
+        if (!find_media_headers(mtd, buf, "BNAND", 0))
+                goto out;
         doc->mh1_page = doc->mh0_page + (4096 >> this->page_shift);
-        mh = (struct INFTLMediaHeader *) buf;
+        mh = (struct INFTLMediaHeader *)buf;
 
         mh->NoOfBootImageBlocks = le32_to_cpu(mh->NoOfBootImageBlocks);
         mh->NoOfBinaryPartitions = le32_to_cpu(mh->NoOfBinaryPartitions);
@@ -1319,8 +1318,10 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
                 parts[numparts].offset = ip->firstUnit << vshift;
                 parts[numparts].size = (1 + ip->lastUnit - ip->firstUnit) << vshift;
                 numparts++;
-                if (ip->lastUnit > lastvunit) lastvunit = ip->lastUnit;
-                if (ip->flags & INFTL_LAST) break;
+                if (ip->lastUnit > lastvunit)
+                        lastvunit = ip->lastUnit;
+                if (ip->flags & INFTL_LAST)
+                        break;
         }
         lastvunit++;
         if ((lastvunit << vshift) < end) {
@@ -1330,7 +1331,7 @@ static inline int __init inftl_partscan(struct mtd_info *mtd,
                 numparts++;
         }
         ret = numparts;
-out:
+ out:
         kfree(buf);
         return ret;
 }
@@ -1342,11 +1343,12 @@ static int __init nftl_scan_bbt(struct mtd_info *mtd)
         struct doc_priv *doc = this->priv;
         struct mtd_partition parts[2];
 
-        memset((char *) parts, 0, sizeof(parts));
+        memset((char *)parts, 0, sizeof(parts));
         /* On NFTL, we have to find the media headers before we can read the
            BBTs, since they're stored in the media header eraseblocks. */
         numparts = nftl_partscan(mtd, parts);
-        if (!numparts) return -EIO;
+        if (!numparts)
+                return -EIO;
         this->bbt_td->options = NAND_BBT_ABSPAGE | NAND_BBT_8BIT |
                                 NAND_BBT_SAVECONTENT | NAND_BBT_WRITE |
                                 NAND_BBT_VERSION;
@@ -1393,8 +1395,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
                 this->bbt_td->pages[0] = 2;
                 this->bbt_md = NULL;
         } else {
-                this->bbt_td->options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT |
-                                        NAND_BBT_VERSION;
+                this->bbt_td->options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT | NAND_BBT_VERSION;
                 if (inftl_bbt_write)
                         this->bbt_td->options |= NAND_BBT_WRITE;
                 this->bbt_td->offs = 8;
@@ -1404,8 +1405,7 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
                 this->bbt_td->reserved_block_code = 0x01;
                 this->bbt_td->pattern = "MSYS_BBT";
 
-                this->bbt_md->options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT |
-                                        NAND_BBT_VERSION;
+                this->bbt_md->options = NAND_BBT_LASTBLOCK | NAND_BBT_8BIT | NAND_BBT_VERSION;
                 if (inftl_bbt_write)
                         this->bbt_md->options |= NAND_BBT_WRITE;
                 this->bbt_md->offs = 8;
@@ -1420,12 +1420,13 @@ static int __init inftl_scan_bbt(struct mtd_info *mtd)
            At least as nand_bbt.c is currently written. */
         if ((ret = nand_scan_bbt(mtd, NULL)))
                 return ret;
-        memset((char *) parts, 0, sizeof(parts));
+        memset((char *)parts, 0, sizeof(parts));
         numparts = inftl_partscan(mtd, parts);
         /* At least for now, require the INFTL Media Header.  We could probably
            do without it for non-INFTL use, since all it gives us is
            autopartitioning, but I want to give it more thought. */
-        if (!numparts) return -EIO;
+        if (!numparts)
+                return -EIO;
         add_mtd_device(mtd);
 #ifdef CONFIG_MTD_PARTITIONS
         if (!no_autopart)
@@ -1439,7 +1440,6 @@ static inline int __init doc2000_init(struct mtd_info *mtd)
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
 
-        this->write_byte = doc2000_write_byte;
         this->read_byte = doc2000_read_byte;
         this->write_buf = doc2000_writebuf;
         this->read_buf = doc2000_readbuf;
@@ -1457,7 +1457,6 @@ static inline int __init doc2001_init(struct mtd_info *mtd)
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
 
-        this->write_byte = doc2001_write_byte;
         this->read_byte = doc2001_read_byte;
         this->write_buf = doc2001_writebuf;
         this->read_buf = doc2001_readbuf;
@@ -1489,16 +1488,15 @@ static inline int __init doc2001plus_init(struct mtd_info *mtd)
         struct nand_chip *this = mtd->priv;
         struct doc_priv *doc = this->priv;
 
-        this->write_byte = NULL;
         this->read_byte = doc2001plus_read_byte;
         this->write_buf = doc2001plus_writebuf;
         this->read_buf = doc2001plus_readbuf;
         this->verify_buf = doc2001plus_verifybuf;
         this->scan_bbt = inftl_scan_bbt;
-        this->hwcontrol = NULL;
+        this->cmd_ctrl = NULL;
         this->select_chip = doc2001plus_select_chip;
         this->cmdfunc = doc2001plus_command;
-        this->enable_hwecc = doc2001plus_enable_hwecc;
+        this->ecc.hwctl = doc2001plus_enable_hwecc;
 
         doc->chips_per_floor = 1;
         mtd->name = "DiskOnChip Millennium Plus";
@@ -1535,20 +1533,16 @@ static int __init doc_probe(unsigned long physadr)
         save_control = ReadDOC(virtadr, DOCControl);
 
         /* Reset the DiskOnChip ASIC */
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,
-                 virtadr, DOCControl);
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET,
-                 virtadr, DOCControl);
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, virtadr, DOCControl);
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_RESET, virtadr, DOCControl);
 
         /* Enable the DiskOnChip ASIC */
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,
-                 virtadr, DOCControl);
-        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL,
-                 virtadr, DOCControl);
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, virtadr, DOCControl);
+        WriteDOC(DOC_MODE_CLR_ERR | DOC_MODE_MDWREN | DOC_MODE_NORMAL, virtadr, DOCControl);
 
         ChipID = ReadDOC(virtadr, ChipID);
 
-        switch(ChipID) {
+        switch (ChipID) {
         case DOC_ChipID_Doc2k:
                 reg = DoC_2k_ECCStatus;
                 break;
@@ -1564,15 +1558,13 @@ static int __init doc_probe(unsigned long physadr)
                         ReadDOC(virtadr, Mplus_Power);
 
                 /* Reset the Millennium Plus ASIC */
-                tmp = DOC_MODE_RESET | DOC_MODE_MDWREN | DOC_MODE_RST_LAT |
-                        DOC_MODE_BDECT;
+                tmp = DOC_MODE_RESET | DOC_MODE_MDWREN | DOC_MODE_RST_LAT | DOC_MODE_BDECT;
                 WriteDOC(tmp, virtadr, Mplus_DOCControl);
                 WriteDOC(~tmp, virtadr, Mplus_CtrlConfirm);
 
                 mdelay(1);
                 /* Enable the Millennium Plus ASIC */
-                tmp = DOC_MODE_NORMAL | DOC_MODE_MDWREN | DOC_MODE_RST_LAT |
-                        DOC_MODE_BDECT;
+                tmp = DOC_MODE_NORMAL | DOC_MODE_MDWREN | DOC_MODE_RST_LAT | DOC_MODE_BDECT;
                 WriteDOC(tmp, virtadr, Mplus_DOCControl);
                 WriteDOC(~tmp, virtadr, Mplus_CtrlConfirm);
                 mdelay(1);
@@ -1596,7 +1588,7 @@ static int __init doc_probe(unsigned long physadr)
                 goto notfound;
         }
         /* Check the TOGGLE bit in the ECC register */
-        tmp  = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
+        tmp = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
         tmpb = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
         tmpc = ReadDOC_(virtadr, reg) & DOC_TOGGLE_BIT;
         if ((tmp == tmpb) || (tmp != tmpc)) {
@@ -1626,11 +1618,11 @@ static int __init doc_probe(unsigned long physadr)
                 if (ChipID == DOC_ChipID_DocMilPlus16) {
                         WriteDOC(~newval, virtadr, Mplus_AliasResolution);
                         oldval = ReadDOC(doc->virtadr, Mplus_AliasResolution);
-                        WriteDOC(newval, virtadr, Mplus_AliasResolution); // restore it
+                        WriteDOC(newval, virtadr, Mplus_AliasResolution);       // restore it
                 } else {
                         WriteDOC(~newval, virtadr, AliasResolution);
                         oldval = ReadDOC(doc->virtadr, AliasResolution);
-                        WriteDOC(newval, virtadr, AliasResolution); // restore it
+                        WriteDOC(newval, virtadr, AliasResolution);     // restore it
                 }
                 newval = ~newval;
                 if (oldval == newval) {
@@ -1642,10 +1634,8 @@ static int __init doc_probe(unsigned long physadr)
         printk(KERN_NOTICE "DiskOnChip found at 0x%lx\n", physadr);
 
         len = sizeof(struct mtd_info) +
-              sizeof(struct nand_chip) +
-              sizeof(struct doc_priv) +
-              (2 * sizeof(struct nand_bbt_descr));
-        mtd =  kmalloc(len, GFP_KERNEL);
+            sizeof(struct nand_chip) + sizeof(struct doc_priv) + (2 * sizeof(struct nand_bbt_descr));
+        mtd = kmalloc(len, GFP_KERNEL);
         if (!mtd) {
                 printk(KERN_ERR "DiskOnChip kmalloc (%d bytes) failed!\n", len);
                 ret = -ENOMEM;
@@ -1663,17 +1653,19 @@ static int __init doc_probe(unsigned long physadr)
 
         nand->priv              = doc;
         nand->select_chip       = doc200x_select_chip;
-        nand->hwcontrol         = doc200x_hwcontrol;
+        nand->cmd_ctrl          = doc200x_hwcontrol;
         nand->dev_ready         = doc200x_dev_ready;
         nand->waitfunc          = doc200x_wait;
         nand->block_bad         = doc200x_block_bad;
-        nand->enable_hwecc      = doc200x_enable_hwecc;
-        nand->calculate_ecc     = doc200x_calculate_ecc;
-        nand->correct_data      = doc200x_correct_data;
+        nand->ecc.hwctl         = doc200x_enable_hwecc;
+        nand->ecc.calculate     = doc200x_calculate_ecc;
+        nand->ecc.correct       = doc200x_correct_data;
 
-        nand->autooob           = &doc200x_oobinfo;
-        nand->eccmode           = NAND_ECC_HW6_512;
-        nand->options           = NAND_USE_FLASH_BBT | NAND_HWECC_SYNDROME;
+        nand->ecc.layout        = &doc200x_oobinfo;
+        nand->ecc.mode          = NAND_ECC_HW_SYNDROME;
+        nand->ecc.size          = 512;
+        nand->ecc.bytes         = 6;
+        nand->options           = NAND_USE_FLASH_BBT;
 
         doc->physadr            = physadr;
         doc->virtadr            = virtadr;
@@ -1707,18 +1699,18 @@ static int __init doc_probe(unsigned long physadr)
         doclist = mtd;
         return 0;
 
-notfound:
+ notfound:
         /* Put back the contents of the DOCControl register, in case it's not
            actually a DiskOnChip.  */
         WriteDOC(save_control, virtadr, DOCControl);
-fail:
+ fail:
         iounmap(virtadr);
         return ret;
 }
 
 static void release_nanddoc(void)
 {
-        struct mtd_info *mtd, *nextmtd;
+        struct mtd_info *mtd, *nextmtd;
         struct nand_chip *nand;
         struct doc_priv *doc;
 
@@ -1747,8 +1739,8 @@ static int __init init_nanddoc(void)
          * generator polinomial degree = 4
          */
         rs_decoder = init_rs(10, 0x409, FCR, 1, NROOTS);
-        if (!rs_decoder) {
-                printk (KERN_ERR "DiskOnChip: Could not create a RS decoder\n");
+        if (!rs_decoder) {
+                printk(KERN_ERR "DiskOnChip: Could not create a RS decoder\n");
                 return -ENOMEM;
         }
 
@@ -1758,7 +1750,7 @@ static int __init init_nanddoc(void)
                 if (ret < 0)
                         goto outerr;
         } else {
-                for (i=0; (doc_locations[i] != 0xffffffff); i++) {
+                for (i = 0; (doc_locations[i] != 0xffffffff); i++) {
                         doc_probe(doc_locations[i]);
                 }
         }
@@ -1770,7 +1762,7 @@ static int __init init_nanddoc(void)
                 goto outerr;
         }
         return 0;
-outerr:
+ outerr:
         free_rs(rs_decoder);
         return ret;
 }
diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c
index 9b1fd2f387fa..516c0e5e564c 100644
--- a/drivers/mtd/nand/edb7312.c
+++ b/drivers/mtd/nand/edb7312.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/mtd/nand/edb7312.c
  *
- *  Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
+ *  Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
  *
  *  Derived from drivers/mtd/nand/autcpu12.c
  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
@@ -25,7 +25,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h> /* for CLPS7111_VIRT_BASE */
+#include <asm/arch/hardware.h>  /* for CLPS7111_VIRT_BASE */
 #include <asm/sizes.h>
 #include <asm/hardware/clps7111.h>
 
@@ -54,51 +54,45 @@ static struct mtd_info *ep7312_mtd = NULL;
  */
 
 static unsigned long ep7312_fio_pbase = EP7312_FIO_PBASE;
-static void __iomem * ep7312_pxdr = (void __iomem *) EP7312_PXDR;
-static void __iomem * ep7312_pxddr = (void __iomem *) EP7312_PXDDR;
+static void __iomem *ep7312_pxdr = (void __iomem *)EP7312_PXDR;
+static void __iomem *ep7312_pxddr = (void __iomem *)EP7312_PXDDR;
 
 #ifdef CONFIG_MTD_PARTITIONS
 /*
  * Define static partitions for flash device
  */
 static struct mtd_partition partition_info[] = {
-        { .name = "EP7312 Nand Flash",
-                  .offset = 0,
-                  .size = 8*1024*1024 }
+        {.name = "EP7312 Nand Flash",
+         .offset = 0,
+         .size = 8 * 1024 * 1024}
 };
+
 #define NUM_PARTITIONS 1
 
 #endif
 
-
 /*
  *      hardware specific access to control-lines
+ *
+ *      NAND_NCE: bit 0 -> bit 7
+ *      NAND_CLE: bit 1 -> bit 4
+ *      NAND_ALE: bit 2 -> bit 5
  */
-static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd)
+static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
-        switch(cmd) {
-
-        case NAND_CTL_SETCLE:
-                clps_writeb(clps_readb(ep7312_pxdr) | 0x10, ep7312_pxdr);
-                break;
-        case NAND_CTL_CLRCLE:
-                clps_writeb(clps_readb(ep7312_pxdr) & ~0x10, ep7312_pxdr);
-                break;
-
-        case NAND_CTL_SETALE:
-                clps_writeb(clps_readb(ep7312_pxdr) | 0x20, ep7312_pxdr);
-                break;
-        case NAND_CTL_CLRALE:
-                clps_writeb(clps_readb(ep7312_pxdr) & ~0x20, ep7312_pxdr);
-                break;
-
-        case NAND_CTL_SETNCE:
-                clps_writeb((clps_readb(ep7312_pxdr) | 0x80) & ~0x40, ep7312_pxdr);
-                break;
-        case NAND_CTL_CLRNCE:
-                clps_writeb((clps_readb(ep7312_pxdr) | 0x80) | 0x40, ep7312_pxdr);
-                break;
+        struct nand_chip *chip = mtd->priv;
+
+        if (ctrl & NAND_CTRL_CHANGE) {
+                unsigned char bits;
+
+                bits = (ctrl & (NAND_CLE | NAND_ALE)) << 3;
+                bits = (ctrl & NAND_NCE) << 7;
+
+                clps_writeb((clps_readb(ep7312_pxdr)  & 0xB0) | 0x10,
+                            ep7312_pxdr);
         }
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
 }
 
 /*
@@ -108,6 +102,7 @@ static int ep7312_device_ready(struct mtd_info *mtd)
 {
         return 1;
 }
+
 #ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", NULL };
 #endif
@@ -115,18 +110,16 @@ const char *part_probes[] = { "cmdlinepart", NULL };
 /*
  * Main initialization routine
  */
-static int __init ep7312_init (void)
+static int __init ep7312_init(void)
 {
         struct nand_chip *this;
         const char *part_type = 0;
         int mtd_parts_nb = 0;
         struct mtd_partition *mtd_parts = 0;
-        void __iomem * ep7312_fio_base;
+        void __iomem *ep7312_fio_base;
 
         /* Allocate memory for MTD device structure and private data */
-        ep7312_mtd = kmalloc(sizeof(struct mtd_info) +
-                             sizeof(struct nand_chip),
-                             GFP_KERNEL);
+        ep7312_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!ep7312_mtd) {
                 printk("Unable to allocate EDB7312 NAND MTD device structure.\n");
                 return -ENOMEM;
@@ -134,21 +127,22 @@ static int __init ep7312_init (void)
 
         /* map physical adress */
         ep7312_fio_base = ioremap(ep7312_fio_pbase, SZ_1K);
-        if(!ep7312_fio_base) {
+        if (!ep7312_fio_base) {
                 printk("ioremap EDB7312 NAND flash failed\n");
                 kfree(ep7312_mtd);
                 return -EIO;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&ep7312_mtd[1]);
+        this = (struct nand_chip *)(&ep7312_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) ep7312_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(ep7312_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         ep7312_mtd->priv = this;
+        ep7312_mtd->owner = THIS_MODULE;
 
         /*
          * Set GPIO Port B control register so that the pins are configured
@@ -159,22 +153,20 @@ static int __init ep7312_init (void)
         /* insert callbacks */
         this->IO_ADDR_R = ep7312_fio_base;
         this->IO_ADDR_W = ep7312_fio_base;
-        this->hwcontrol = ep7312_hwcontrol;
+        this->cmd_ctrl = ep7312_hwcontrol;
         this->dev_ready = ep7312_device_ready;
         /* 15 us command delay time */
         this->chip_delay = 15;
 
         /* Scan to find existence of the device */
-        if (nand_scan (ep7312_mtd, 1)) {
+        if (nand_scan(ep7312_mtd, 1)) {
                 iounmap((void *)ep7312_fio_base);
-                kfree (ep7312_mtd);
+                kfree(ep7312_mtd);
                 return -ENXIO;
         }
-
 #ifdef CONFIG_MTD_PARTITIONS
         ep7312_mtd->name = "edb7312-nand";
-        mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, part_probes,
-                                            &mtd_parts, 0);
+        mtd_parts_nb = parse_mtd_partitions(ep7312_mtd, part_probes, &mtd_parts, 0);
         if (mtd_parts_nb > 0)
                 part_type = "command line";
         else
@@ -193,24 +185,23 @@ static int __init ep7312_init (void)
         /* Return happy */
         return 0;
 }
+
 module_init(ep7312_init);
 
 /*
  * Clean up routine
  */
-static void __exit ep7312_cleanup (void)
+static void __exit ep7312_cleanup(void)
 {
-        struct nand_chip *this = (struct nand_chip *) &ep7312_mtd[1];
+        struct nand_chip *this = (struct nand_chip *)&ep7312_mtd[1];
 
         /* Release resources, unregister device */
-        nand_release (ap7312_mtd);
-
-        /* Free internal data buffer */
-        kfree (this->data_buf);
+        nand_release(ap7312_mtd);
 
         /* Free the MTD device structure */
-        kfree (ep7312_mtd);
+        kfree(ep7312_mtd);
 }
+
 module_exit(ep7312_cleanup);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index f68f7a99a630..2d585d2d090c 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2003 Joshua Wise (joshua@joshuawise.com)
  *
  *  Derived from drivers/mtd/nand/edb7312.c
- *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
+ *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
  *
  * $Id: h1910.c,v 1.6 2005/11/07 11:14:30 gleixner Exp $
@@ -26,7 +26,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h> /* for CLPS7111_VIRT_BASE */
+#include <asm/arch/hardware.h>  /* for CLPS7111_VIRT_BASE */
 #include <asm/sizes.h>
 #include <asm/arch/h1900-gpio.h>
 #include <asm/arch/ipaq.h>
@@ -45,47 +45,29 @@ static struct mtd_info *h1910_nand_mtd = NULL;
  * Define static partitions for flash device
  */
 static struct mtd_partition partition_info[] = {
-        { name: "h1910 NAND Flash",
-                  offset: 0,
-                  size: 16*1024*1024 }
+      {name:"h1910 NAND Flash",
+              offset:0,
+      size:16 * 1024 * 1024}
 };
+
 #define NUM_PARTITIONS 1
 
 #endif
 
-
 /*
  *      hardware specific access to control-lines
+ *
+ *      NAND_NCE: bit 0 - don't care
+ *      NAND_CLE: bit 1 - address bit 2
+ *      NAND_ALE: bit 2 - address bit 3
  */
-static void h1910_hwcontrol(struct mtd_info *mtd, int cmd)
+static void h1910_hwcontrol(struct mtd_info *mtd, int cmd,
+                            unsigned int ctrl)
 {
-        struct nand_chip* this = (struct nand_chip *) (mtd->priv);
-
-        switch(cmd) {
-
-        case NAND_CTL_SETCLE:
-                this->IO_ADDR_R |= (1 << 2);
-                this->IO_ADDR_W |= (1 << 2);
-                break;
-        case NAND_CTL_CLRCLE:
-                this->IO_ADDR_R &= ~(1 << 2);
-                this->IO_ADDR_W &= ~(1 << 2);
-                break;
-
-        case NAND_CTL_SETALE:
-                this->IO_ADDR_R |= (1 << 3);
-                this->IO_ADDR_W |= (1 << 3);
-                break;
-        case NAND_CTL_CLRALE:
-                this->IO_ADDR_R &= ~(1 << 3);
-                this->IO_ADDR_W &= ~(1 << 3);
-                break;
-
-        case NAND_CTL_SETNCE:
-                break;
-        case NAND_CTL_CLRNCE:
-                break;
-        }
+        struct nand_chip *chip = mtd->priv;
+
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W | ((ctrl & 0x6) << 1));
 }
 
 /*
@@ -101,7 +83,7 @@ static int h1910_device_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-static int __init h1910_init (void)
+static int __init h1910_init(void)
 {
         struct nand_chip *this;
         const char *part_type = 0;
@@ -119,24 +101,23 @@ static int __init h1910_init (void)
         }
 
         /* Allocate memory for MTD device structure and private data */
-        h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) +
-                             sizeof(struct nand_chip),
-                             GFP_KERNEL);
+        h1910_nand_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!h1910_nand_mtd) {
                 printk("Unable to allocate h1910 NAND MTD device structure.\n");
-                iounmap ((void *) nandaddr);
+                iounmap((void *)nandaddr);
                 return -ENOMEM;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&h1910_nand_mtd[1]);
+        this = (struct nand_chip *)(&h1910_nand_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) h1910_nand_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(h1910_nand_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         h1910_nand_mtd->priv = this;
+        h1910_nand_mtd->owner = THIS_MODULE;
 
         /*
          * Enable VPEN
@@ -146,31 +127,28 @@ static int __init h1910_init (void)
         /* insert callbacks */
         this->IO_ADDR_R = nandaddr;
         this->IO_ADDR_W = nandaddr;
-        this->hwcontrol = h1910_hwcontrol;
+        this->cmd_ctrl = h1910_hwcontrol;
         this->dev_ready = NULL; /* unknown whether that was correct or not so we will just do it like this */
         /* 15 us command delay time */
         this->chip_delay = 50;
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
         this->options = NAND_NO_AUTOINCR;
 
         /* Scan to find existence of the device */
-        if (nand_scan (h1910_nand_mtd, 1)) {
+        if (nand_scan(h1910_nand_mtd, 1)) {
                 printk(KERN_NOTICE "No NAND device - returning -ENXIO\n");
-                kfree (h1910_nand_mtd);
-                iounmap ((void *) nandaddr);
+                kfree(h1910_nand_mtd);
+                iounmap((void *)nandaddr);
                 return -ENXIO;
         }
-
 #ifdef CONFIG_MTD_CMDLINE_PARTS
-        mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts,
-                                                "h1910-nand");
+        mtd_parts_nb = parse_cmdline_partitions(h1910_nand_mtd, &mtd_parts, "h1910-nand");
         if (mtd_parts_nb > 0)
-          part_type = "command line";
+                part_type = "command line";
         else
-          mtd_parts_nb = 0;
+                mtd_parts_nb = 0;
 #endif
-        if (mtd_parts_nb == 0)
-        {
+        if (mtd_parts_nb == 0) {
                 mtd_parts = partition_info;
                 mtd_parts_nb = NUM_PARTITIONS;
                 part_type = "static";
@@ -183,24 +161,26 @@ static int __init h1910_init (void)
         /* Return happy */
         return 0;
 }
+
 module_init(h1910_init);
 
 /*
  * Clean up routine
  */
-static void __exit h1910_cleanup (void)
+static void __exit h1910_cleanup(void)
 {
-        struct nand_chip *this = (struct nand_chip *) &h1910_nand_mtd[1];
+        struct nand_chip *this = (struct nand_chip *)&h1910_nand_mtd[1];
 
         /* Release resources, unregister device */
-        nand_release (h1910_nand_mtd);
+        nand_release(h1910_nand_mtd);
 
         /* Release io resource */
-        iounmap ((void *) this->IO_ADDR_W);
+        iounmap((void *)this->IO_ADDR_W);
 
         /* Free the MTD device structure */
-        kfree (h1910_nand_mtd);
+        kfree(h1910_nand_mtd);
 }
+
 module_exit(h1910_cleanup);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 95e96fa1fceb..27083ed0a017 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -10,67 +10,31 @@
  *      http://www.linux-mtd.infradead.org/tech/nand.html
  *
  *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
- *                2002 Thomas Gleixner (tglx@linutronix.de)
+ *                2002-2006 Thomas Gleixner (tglx@linutronix.de)
  *
- *  02-08-2004  tglx: support for strange chips, which cannot auto increment
- *              pages on read / read_oob
- *
- *  03-17-2004  tglx: Check ready before auto increment check. Simon Bayes
- *              pointed this out, as he marked an auto increment capable chip
- *              as NOAUTOINCR in the board driver.
- *              Make reads over block boundaries work too
- *
- *  04-14-2004  tglx: first working version for 2k page size chips
- *
- *  05-19-2004  tglx: Basic support for Renesas AG-AND chips
- *
- *  09-24-2004  tglx: add support for hardware controllers (e.g. ECC) shared
- *              among multiple independend devices. Suggestions and initial patch
- *              from Ben Dooks <ben-mtd@fluff.org>
- *
- *  12-05-2004  dmarlin: add workaround for Renesas AG-AND chips "disturb" issue.
- *              Basically, any block not rewritten may lose data when surrounding blocks
- *              are rewritten many times.  JFFS2 ensures this doesn't happen for blocks
- *              it uses, but the Bad Block Table(s) may not be rewritten.  To ensure they
- *              do not lose data, force them to be rewritten when some of the surrounding
- *              blocks are erased.  Rather than tracking a specific nearby block (which
- *              could itself go bad), use a page address 'mask' to select several blocks
- *              in the same area, and rewrite the BBT when any of them are erased.
- *
- *  01-03-2005  dmarlin: added support for the device recovery command sequence for Renesas
- *              AG-AND chips.  If there was a sudden loss of power during an erase operation,
- *              a "device recovery" operation must be performed when power is restored
- *              to ensure correct operation.
- *
- *  01-20-2005  dmarlin: added support for optional hardware specific callback routine to
- *              perform extra error status checks on erase and write failures.  This required
- *              adding a wrapper function for nand_read_ecc.
- *
- * 08-20-2005   vwool: suspend/resume added
- *
- * Credits:
+ *  Credits:
  *      David Woodhouse for adding multichip support
  *
  *      Aleph One Ltd. and Toby Churchill Ltd. for supporting the
  *      rework for 2K page size chips
  *
- * TODO:
+ *  TODO:
  *      Enable cached programming for 2k page size chips
  *      Check, if mtd->ecctype should be set to MTD_ECC_HW
  *      if we have HW ecc support.
  *      The AG-AND chips have nice features for speed improvement,
  *      which are not supported yet. Read / program 4 pages in one go.
  *
- * $Id: nand_base.c,v 1.150 2005/09/15 13:58:48 vwool Exp $
- *
  * 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.
  *
  */
 
+#include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/errno.h>
+#include <linux/err.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/types.h>
@@ -88,75 +52,46 @@
 #endif
 
 /* Define default oob placement schemes for large and small page devices */
-static struct nand_oobinfo nand_oob_8 = {
-        .useecc = MTD_NANDECC_AUTOPLACE,
+static struct nand_ecclayout nand_oob_8 = {
         .eccbytes = 3,
         .eccpos = {0, 1, 2},
-        .oobfree = { {3, 2}, {6, 2} }
+        .oobfree = {
+                {.offset = 3,
+                 .length = 2},
+                {.offset = 6,
+                 .length = 2}}
 };
 
-static struct nand_oobinfo nand_oob_16 = {
-        .useecc = MTD_NANDECC_AUTOPLACE,
+static struct nand_ecclayout nand_oob_16 = {
         .eccbytes = 6,
         .eccpos = {0, 1, 2, 3, 6, 7},
-        .oobfree = { {8, 8} }
+        .oobfree = {
+                {.offset = 8,
+                 . length = 8}}
 };
 
-static struct nand_oobinfo nand_oob_64 = {
-        .useecc = MTD_NANDECC_AUTOPLACE,
+static struct nand_ecclayout nand_oob_64 = {
         .eccbytes = 24,
         .eccpos = {
-                40, 41, 42, 43, 44, 45, 46, 47,
-                48, 49, 50, 51, 52, 53, 54, 55,
-                56, 57, 58, 59, 60, 61, 62, 63},
-        .oobfree = { {2, 38} }
+                   40, 41, 42, 43, 44, 45, 46, 47,
+                   48, 49, 50, 51, 52, 53, 54, 55,
+                   56, 57, 58, 59, 60, 61, 62, 63},
+        .oobfree = {
+                {.offset = 2,
+                 .length = 38}}
 };
 
-/* This is used for padding purposes in nand_write_oob */
-static u_char ffchars[] = {
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-};
+static int nand_get_device(struct nand_chip *chip, struct mtd_info *mtd,
+                           int new_state);
+
+static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
+                             struct mtd_oob_ops *ops);
 
 /*
- * NAND low-level MTD interface functions
+ * For devices which display every fart in the system on a seperate LED. Is
+ * compiled away when LED support is disabled.
  */
-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len);
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len);
-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len);
-
-static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf);
-static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                          size_t * retlen, u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel);
-static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf);
-static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf);
-static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
-                           size_t * retlen, const u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel);
-static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char *buf);
-static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs,
-                        unsigned long count, loff_t to, size_t * retlen);
-static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs,
-                        unsigned long count, loff_t to, size_t * retlen, u_char *eccbuf, struct nand_oobinfo *oobsel);
-static int nand_erase (struct mtd_info *mtd, struct erase_info *instr);
-static void nand_sync (struct mtd_info *mtd);
-
-/* Some internal functions */
-static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page, u_char *oob_buf,
-                struct nand_oobinfo *oobsel, int mode);
-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages,
-        u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode);
-#else
-#define nand_verify_pages(...) (0)
-#endif
-
-static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state);
+DEFINE_LED_TRIGGER(nand_led_trigger);
 
 /**
  * nand_release_device - [GENERIC] release chip
@@ -164,27 +99,19 @@ static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int ne
  *
  * Deselect, release chip lock and wake up anyone waiting on the device
  */
-static void nand_release_device (struct mtd_info *mtd)
+static void nand_release_device(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
         /* De-select the NAND device */
-        this->select_chip(mtd, -1);
-
-        if (this->controller) {
-                /* Release the controller and the chip */
-                spin_lock(&this->controller->lock);
-                this->controller->active = NULL;
-                this->state = FL_READY;
-                wake_up(&this->controller->wq);
-                spin_unlock(&this->controller->lock);
-        } else {
-                /* Release the chip */
-                spin_lock(&this->chip_lock);
-                this->state = FL_READY;
-                wake_up(&this->wq);
-                spin_unlock(&this->chip_lock);
-        }
+        chip->select_chip(mtd, -1);
+
+        /* Release the controller and the chip */
+        spin_lock(&chip->controller->lock);
+        chip->controller->active = NULL;
+        chip->state = FL_READY;
+        wake_up(&chip->controller->wq);
+        spin_unlock(&chip->controller->lock);
 }
 
 /**
@@ -193,23 +120,10 @@ static void nand_release_device (struct mtd_info *mtd)
  *
  * Default read function for 8bit buswith
  */
-static u_char nand_read_byte(struct mtd_info *mtd)
-{
-        struct nand_chip *this = mtd->priv;
-        return readb(this->IO_ADDR_R);
-}
-
-/**
- * nand_write_byte - [DEFAULT] write one byte to the chip
- * @mtd:        MTD device structure
- * @byte:       pointer to data byte to write
- *
- * Default write function for 8it buswith
- */
-static void nand_write_byte(struct mtd_info *mtd, u_char byte)
+static uint8_t nand_read_byte(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
-        writeb(byte, this->IO_ADDR_W);
+        struct nand_chip *chip = mtd->priv;
+        return readb(chip->IO_ADDR_R);
 }
 
 /**
@@ -219,24 +133,10 @@ static void nand_write_byte(struct mtd_info *mtd, u_char byte)
  * Default read function for 16bit buswith with
  * endianess conversion
  */
-static u_char nand_read_byte16(struct mtd_info *mtd)
+static uint8_t nand_read_byte16(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
-        return (u_char) cpu_to_le16(readw(this->IO_ADDR_R));
-}
-
-/**
- * nand_write_byte16 - [DEFAULT] write one byte endianess aware to the chip
- * @mtd:        MTD device structure
- * @byte:       pointer to data byte to write
- *
- * Default write function for 16bit buswith with
- * endianess conversion
- */
-static void nand_write_byte16(struct mtd_info *mtd, u_char byte)
-{
-        struct nand_chip *this = mtd->priv;
-        writew(le16_to_cpu((u16) byte), this->IO_ADDR_W);
+        struct nand_chip *chip = mtd->priv;
+        return (uint8_t) cpu_to_le16(readw(chip->IO_ADDR_R));
 }
 
 /**
@@ -248,22 +148,8 @@ static void nand_write_byte16(struct mtd_info *mtd, u_char byte)
  */
 static u16 nand_read_word(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
-        return readw(this->IO_ADDR_R);
-}
-
-/**
- * nand_write_word - [DEFAULT] write one word to the chip
- * @mtd:        MTD device structure
- * @word:       data word to write
- *
- * Default write function for 16bit buswith without
- * endianess conversion
- */
-static void nand_write_word(struct mtd_info *mtd, u16 word)
-{
-        struct nand_chip *this = mtd->priv;
-        writew(word, this->IO_ADDR_W);
+        struct nand_chip *chip = mtd->priv;
+        return readw(chip->IO_ADDR_R);
 }
 
 /**
@@ -273,15 +159,15 @@ static void nand_write_word(struct mtd_info *mtd, u16 word)
  *
  * Default select function for 1 chip devices.
  */
-static void nand_select_chip(struct mtd_info *mtd, int chip)
+static void nand_select_chip(struct mtd_info *mtd, int chipnr)
 {
-        struct nand_chip *this = mtd->priv;
-        switch(chip) {
+        struct nand_chip *chip = mtd->priv;
+
+        switch (chipnr) {
         case -1:
-                this->hwcontrol(mtd, NAND_CTL_CLRNCE);
+                chip->cmd_ctrl(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);
                 break;
         case 0:
-                this->hwcontrol(mtd, NAND_CTL_SETNCE);
                 break;
 
         default:
@@ -297,13 +183,13 @@ static void nand_select_chip(struct mtd_info *mtd, int chip)
  *
  * Default write function for 8bit buswith
  */
-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
         int i;
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
-        for (i=0; i<len; i++)
-                writeb(buf[i], this->IO_ADDR_W);
+        for (i = 0; i < len; i++)
+                writeb(buf[i], chip->IO_ADDR_W);
 }
 
 /**
@@ -314,13 +200,13 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
  *
  * Default read function for 8bit buswith
  */
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+static void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
 {
         int i;
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
-        for (i=0; i<len; i++)
-                buf[i] = readb(this->IO_ADDR_R);
+        for (i = 0; i < len; i++)
+                buf[i] = readb(chip->IO_ADDR_R);
 }
 
 /**
@@ -331,15 +217,14 @@ static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
  *
  * Default verify function for 8bit buswith
  */
-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static int nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
         int i;
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
-        for (i=0; i<len; i++)
-                if (buf[i] != readb(this->IO_ADDR_R))
+        for (i = 0; i < len; i++)
+                if (buf[i] != readb(chip->IO_ADDR_R))
                         return -EFAULT;
-
         return 0;
 }
 
@@ -351,15 +236,15 @@ static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
  *
  * Default write function for 16bit buswith
  */
-static void nand_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)
+static void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
         int i;
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         u16 *p = (u16 *) buf;
         len >>= 1;
 
-        for (i=0; i<len; i++)
-                writew(p[i], this->IO_ADDR_W);
+        for (i = 0; i < len; i++)
+                writew(p[i], chip->IO_ADDR_W);
 
 }
 
@@ -371,15 +256,15 @@ static void nand_write_buf16(struct mtd_info *mtd, const u_char *buf, int len)
  *
  * Default read function for 16bit buswith
  */
-static void nand_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
+static void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len)
 {
         int i;
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         u16 *p = (u16 *) buf;
         len >>= 1;
 
-        for (i=0; i<len; i++)
-                p[i] = readw(this->IO_ADDR_R);
+        for (i = 0; i < len; i++)
+                p[i] = readw(chip->IO_ADDR_R);
 }
 
 /**
@@ -390,15 +275,15 @@ static void nand_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
  *
  * Default verify function for 16bit buswith
  */
-static int nand_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)
+static int nand_verify_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
         int i;
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         u16 *p = (u16 *) buf;
         len >>= 1;
 
-        for (i=0; i<len; i++)
-                if (p[i] != readw(this->IO_ADDR_R))
+        for (i = 0; i < len; i++)
+                if (p[i] != readw(chip->IO_ADDR_R))
                         return -EFAULT;
 
         return 0;
@@ -415,38 +300,37 @@ static int nand_verify_buf16(struct mtd_info *mtd, const u_char *buf, int len)
 static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
 {
         int page, chipnr, res = 0;
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         u16 bad;
 
         if (getchip) {
-                page = (int)(ofs >> this->page_shift);
-                chipnr = (int)(ofs >> this->chip_shift);
+                page = (int)(ofs >> chip->page_shift);
+                chipnr = (int)(ofs >> chip->chip_shift);
 
-                /* Grab the lock and see if the device is available */
-                nand_get_device (this, mtd, FL_READING);
+                nand_get_device(chip, mtd, FL_READING);
 
                 /* Select the NAND device */
-                this->select_chip(mtd, chipnr);
+                chip->select_chip(mtd, chipnr);
         } else
-                page = (int) ofs;
+                page = (int)ofs;
 
-        if (this->options & NAND_BUSWIDTH_16) {
-                this->cmdfunc (mtd, NAND_CMD_READOOB, this->badblockpos & 0xFE, page & this->pagemask);
-                bad = cpu_to_le16(this->read_word(mtd));
-                if (this->badblockpos & 0x1)
+        if (chip->options & NAND_BUSWIDTH_16) {
+                chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos & 0xFE,
+                              page & chip->pagemask);
+                bad = cpu_to_le16(chip->read_word(mtd));
+                if (chip->badblockpos & 0x1)
                         bad >>= 8;
                 if ((bad & 0xFF) != 0xff)
                         res = 1;
         } else {
-                this->cmdfunc (mtd, NAND_CMD_READOOB, this->badblockpos, page & this->pagemask);
-                if (this->read_byte(mtd) != 0xff)
+                chip->cmdfunc(mtd, NAND_CMD_READOOB, chip->badblockpos,
+                              page & chip->pagemask);
+                if (chip->read_byte(mtd) != 0xff)
                         res = 1;
         }
 
-        if (getchip) {
-                /* Deselect and wake up anyone waiting on the device */
+        if (getchip)
                 nand_release_device(mtd);
-        }
 
         return res;
 }
@@ -461,23 +345,33 @@ static int nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
 */
 static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
 {
-        struct nand_chip *this = mtd->priv;
-        u_char buf[2] = {0, 0};
-        size_t  retlen;
-        int block;
+        struct nand_chip *chip = mtd->priv;
+        uint8_t buf[2] = { 0, 0 };
+        int block, ret;
 
         /* Get block number */
-        block = ((int) ofs) >> this->bbt_erase_shift;
-        if (this->bbt)
-                this->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
+        block = ((int)ofs) >> chip->bbt_erase_shift;
+        if (chip->bbt)
+                chip->bbt[block >> 2] |= 0x01 << ((block & 0x03) << 1);
 
         /* Do we have a flash based bad block table ? */
-        if (this->options & NAND_USE_FLASH_BBT)
-                return nand_update_bbt (mtd, ofs);
+        if (chip->options & NAND_USE_FLASH_BBT)
+                ret = nand_update_bbt(mtd, ofs);
+        else {
+                /* We write two bytes, so we dont have to mess with 16 bit
+                 * access
+                 */
+                ofs += mtd->oobsize;
+                chip->ops.len = 2;
+                chip->ops.datbuf = NULL;
+                chip->ops.oobbuf = buf;
+                chip->ops.ooboffs = chip->badblockpos & ~0x01;
 
-        /* We write two bytes, so we dont have to mess with 16 bit access */
-        ofs += mtd->oobsize + (this->badblockpos & ~0x01);
-        return nand_write_oob (mtd, ofs , 2, &retlen, buf);
+                ret = nand_do_write_oob(mtd, ofs, &chip->ops);
+        }
+        if (!ret)
+                mtd->ecc_stats.badblocks++;
+        return ret;
 }
 
 /**
@@ -487,12 +381,12 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
  *
  * The function expects, that the device is already selected
  */
-static int nand_check_wp (struct mtd_info *mtd)
+static int nand_check_wp(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         /* Check the WP bit */
-        this->cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);
-        return (this->read_byte(mtd) & NAND_STATUS_WP) ? 0 : 1;
+        chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
+        return (chip->read_byte(mtd) & NAND_STATUS_WP) ? 0 : 1;
 }
 
 /**
@@ -505,32 +399,31 @@ static int nand_check_wp (struct mtd_info *mtd)
  * Check, if the block is bad. Either by reading the bad block table or
  * calling of the scan function.
  */
-static int nand_block_checkbad (struct mtd_info *mtd, loff_t ofs, int getchip, int allowbbt)
+static int nand_block_checkbad(struct mtd_info *mtd, loff_t ofs, int getchip,
+                               int allowbbt)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
-        if (!this->bbt)
-                return this->block_bad(mtd, ofs, getchip);
+        if (!chip->bbt)
+                return chip->block_bad(mtd, ofs, getchip);
 
         /* Return info from the table */
-        return nand_isbad_bbt (mtd, ofs, allowbbt);
+        return nand_isbad_bbt(mtd, ofs, allowbbt);
 }
 
-DEFINE_LED_TRIGGER(nand_led_trigger);
-
 /*
  * Wait for the ready pin, after a command
  * The timeout is catched later.
  */
 static void nand_wait_ready(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
-        unsigned long   timeo = jiffies + 2;
+        struct nand_chip *chip = mtd->priv;
+        unsigned long timeo = jiffies + 2;
 
         led_trigger_event(nand_led_trigger, LED_FULL);
         /* wait until command is processed or timeout occures */
         do {
-                if (this->dev_ready(mtd))
+                if (chip->dev_ready(mtd))
                         break;
                 touch_softlockup_watchdog();
         } while (time_before(jiffies, timeo));
@@ -547,21 +440,21 @@ static void nand_wait_ready(struct mtd_info *mtd)
  * Send command to NAND device. This function is used for small page
  * devices (256/512 Bytes per page)
  */
-static void nand_command (struct mtd_info *mtd, unsigned command, int column, int page_addr)
+static void nand_command(struct mtd_info *mtd, unsigned int command,
+                         int column, int page_addr)
 {
-        register struct nand_chip *this = mtd->priv;
+        register struct nand_chip *chip = mtd->priv;
+        int ctrl = NAND_CTRL_CLE | NAND_CTRL_CHANGE;
 
-        /* Begin command latch cycle */
-        this->hwcontrol(mtd, NAND_CTL_SETCLE);
         /*
          * Write out the command to the device.
          */
         if (command == NAND_CMD_SEQIN) {
                 int readcmd;
 
-                if (column >= mtd->oobblock) {
+                if (column >= mtd->writesize) {
                         /* OOB area */
-                        column -= mtd->oobblock;
+                        column -= mtd->writesize;
                         readcmd = NAND_CMD_READOOB;
                 } else if (column < 256) {
                         /* First 256 bytes --> READ0 */
@@ -570,38 +463,37 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in
                         column -= 256;
                         readcmd = NAND_CMD_READ1;
                 }
-                this->write_byte(mtd, readcmd);
+                chip->cmd_ctrl(mtd, readcmd, ctrl);
+                ctrl &= ~NAND_CTRL_CHANGE;
         }
-        this->write_byte(mtd, command);
-
-        /* Set ALE and clear CLE to start address cycle */
-        this->hwcontrol(mtd, NAND_CTL_CLRCLE);
+        chip->cmd_ctrl(mtd, command, ctrl);
 
-        if (column != -1 || page_addr != -1) {
-                this->hwcontrol(mtd, NAND_CTL_SETALE);
-
-                /* Serially input address */
-                if (column != -1) {
-                        /* Adjust columns for 16 bit buswidth */
-                        if (this->options & NAND_BUSWIDTH_16)
-                                column >>= 1;
-                        this->write_byte(mtd, column);
-                }
-                if (page_addr != -1) {
-                        this->write_byte(mtd, (unsigned char) (page_addr & 0xff));
-                        this->write_byte(mtd, (unsigned char) ((page_addr >> 8) & 0xff));
-                        /* One more address cycle for devices > 32MiB */
-                        if (this->chipsize > (32 << 20))
-                                this->write_byte(mtd, (unsigned char) ((page_addr >> 16) & 0x0f));
-                }
-                /* Latch in address */
-                this->hwcontrol(mtd, NAND_CTL_CLRALE);
+        /*
+         * Address cycle, when necessary
+         */
+        ctrl = NAND_CTRL_ALE | NAND_CTRL_CHANGE;
+        /* Serially input address */
+        if (column != -1) {
+                /* Adjust columns for 16 bit buswidth */
+                if (chip->options & NAND_BUSWIDTH_16)
+                        column >>= 1;
+                chip->cmd_ctrl(mtd, column, ctrl);
+                ctrl &= ~NAND_CTRL_CHANGE;
+        }
+        if (page_addr != -1) {
+                chip->cmd_ctrl(mtd, page_addr, ctrl);
+                ctrl &= ~NAND_CTRL_CHANGE;
+                chip->cmd_ctrl(mtd, page_addr >> 8, ctrl);
+                /* One more address cycle for devices > 32MiB */
+                if (chip->chipsize > (32 << 20))
+                        chip->cmd_ctrl(mtd, page_addr >> 16, ctrl);
         }
+        chip->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
 
         /*
          * program and erase have their own busy handlers
          * status and sequential in needs no delay
-        */
+         */
         switch (command) {
 
         case NAND_CMD_PAGEPROG:
@@ -612,29 +504,30 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in
                 return;
 
         case NAND_CMD_RESET:
-                if (this->dev_ready)
+                if (chip->dev_ready)
                         break;
-                udelay(this->chip_delay);
-                this->hwcontrol(mtd, NAND_CTL_SETCLE);
-                this->write_byte(mtd, NAND_CMD_STATUS);
-                this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-                while ( !(this->read_byte(mtd) & NAND_STATUS_READY));
+                udelay(chip->chip_delay);
+                chip->cmd_ctrl(mtd, NAND_CMD_STATUS,
+                               NAND_CTRL_CLE | NAND_CTRL_CHANGE);
+                chip->cmd_ctrl(mtd,
+                               NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
+                while (!(chip->read_byte(mtd) & NAND_STATUS_READY)) ;
                 return;
 
-        /* This applies to read commands */
+                /* This applies to read commands */
         default:
                 /*
                  * If we don't have access to the busy pin, we apply the given
                  * command delay
-                */
-                if (!this->dev_ready) {
-                        udelay (this->chip_delay);
+                 */
+                if (!chip->dev_ready) {
+                        udelay(chip->chip_delay);
                         return;
                 }
         }
         /* Apply this short delay always to ensure that we do wait tWB in
          * any case on any machine. */
-        ndelay (100);
+        ndelay(100);
 
         nand_wait_ready(mtd);
 }
@@ -646,50 +539,49 @@ static void nand_command (struct mtd_info *mtd, unsigned command, int column, in
  * @column:     the column address for this command, -1 if none
  * @page_addr:  the page address for this command, -1 if none
  *
- * Send command to NAND device. This is the version for the new large page devices
- * We dont have the seperate regions as we have in the small page devices.
- * We must emulate NAND_CMD_READOOB to keep the code compatible.
+ * Send command to NAND device. This is the version for the new large page
+ * devices We dont have the separate regions as we have in the small page
+ * devices.  We must emulate NAND_CMD_READOOB to keep the code compatible.
  *
  */
-static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column, int page_addr)
+static void nand_command_lp(struct mtd_info *mtd, unsigned int command,
+                            int column, int page_addr)
 {
-        register struct nand_chip *this = mtd->priv;
+        register struct nand_chip *chip = mtd->priv;
 
         /* Emulate NAND_CMD_READOOB */
         if (command == NAND_CMD_READOOB) {
-                column += mtd->oobblock;
+                column += mtd->writesize;
                 command = NAND_CMD_READ0;
         }
 
-
-        /* Begin command latch cycle */
-        this->hwcontrol(mtd, NAND_CTL_SETCLE);
-        /* Write out the command to the device. */
-        this->write_byte(mtd, (command & 0xff));
-        /* End command latch cycle */
-        this->hwcontrol(mtd, NAND_CTL_CLRCLE);
+        /* Command latch cycle */
+        chip->cmd_ctrl(mtd, command & 0xff,
+                       NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);
 
         if (column != -1 || page_addr != -1) {
-                this->hwcontrol(mtd, NAND_CTL_SETALE);
+                int ctrl = NAND_CTRL_CHANGE | NAND_NCE | NAND_ALE;
 
                 /* Serially input address */
                 if (column != -1) {
                         /* Adjust columns for 16 bit buswidth */
-                        if (this->options & NAND_BUSWIDTH_16)
+                        if (chip->options & NAND_BUSWIDTH_16)
                                 column >>= 1;
-                        this->write_byte(mtd, column & 0xff);
-                        this->write_byte(mtd, column >> 8);
+                        chip->cmd_ctrl(mtd, column, ctrl);
+                        ctrl &= ~NAND_CTRL_CHANGE;
+                        chip->cmd_ctrl(mtd, column >> 8, ctrl);
                 }
                 if (page_addr != -1) {
-                        this->write_byte(mtd, (unsigned char) (page_addr & 0xff));
-                        this->write_byte(mtd, (unsigned char) ((page_addr >> 8) & 0xff));
+                        chip->cmd_ctrl(mtd, page_addr, ctrl);
+                        chip->cmd_ctrl(mtd, page_addr >> 8,
+                                       NAND_NCE | NAND_ALE);
                         /* One more address cycle for devices > 128MiB */
-                        if (this->chipsize > (128 << 20))
-                                this->write_byte(mtd, (unsigned char) ((page_addr >> 16) & 0xff));
+                        if (chip->chipsize > (128 << 20))
+                                chip->cmd_ctrl(mtd, page_addr >> 16,
+                                               NAND_NCE | NAND_ALE);
                 }
-                /* Latch in address */
-                this->hwcontrol(mtd, NAND_CTL_CLRALE);
         }
+        chip->cmd_ctrl(mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE);
 
         /*
          * program and erase have their own busy handlers
@@ -702,55 +594,62 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
         case NAND_CMD_ERASE1:
         case NAND_CMD_ERASE2:
         case NAND_CMD_SEQIN:
+        case NAND_CMD_RNDIN:
         case NAND_CMD_STATUS:
         case NAND_CMD_DEPLETE1:
                 return;
 
-        /*
-         * read error status commands require only a short delay
-         */
+                /*
+                 * read error status commands require only a short delay
+                 */
         case NAND_CMD_STATUS_ERROR:
         case NAND_CMD_STATUS_ERROR0:
         case NAND_CMD_STATUS_ERROR1:
         case NAND_CMD_STATUS_ERROR2:
         case NAND_CMD_STATUS_ERROR3:
-                udelay(this->chip_delay);
+                udelay(chip->chip_delay);
                 return;
 
         case NAND_CMD_RESET:
-                if (this->dev_ready)
+                if (chip->dev_ready)
                         break;
-                udelay(this->chip_delay);
-                this->hwcontrol(mtd, NAND_CTL_SETCLE);
-                this->write_byte(mtd, NAND_CMD_STATUS);
-                this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-                while ( !(this->read_byte(mtd) & NAND_STATUS_READY));
+                udelay(chip->chip_delay);
+                chip->cmd_ctrl(mtd, NAND_CMD_STATUS,
+                               NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);
+                chip->cmd_ctrl(mtd, NAND_CMD_NONE,
+                               NAND_NCE | NAND_CTRL_CHANGE);
+                while (!(chip->read_byte(mtd) & NAND_STATUS_READY)) ;
+                return;
+
+        case NAND_CMD_RNDOUT:
+                /* No ready / busy check necessary */
+                chip->cmd_ctrl(mtd, NAND_CMD_RNDOUTSTART,
+                               NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);
+                chip->cmd_ctrl(mtd, NAND_CMD_NONE,
+                               NAND_NCE | NAND_CTRL_CHANGE);
                 return;
 
         case NAND_CMD_READ0:
-                /* Begin command latch cycle */
-                this->hwcontrol(mtd, NAND_CTL_SETCLE);
-                /* Write out the start read command */
-                this->write_byte(mtd, NAND_CMD_READSTART);
-                /* End command latch cycle */
-                this->hwcontrol(mtd, NAND_CTL_CLRCLE);
-                /* Fall through into ready check */
-
-        /* This applies to read commands */
+                chip->cmd_ctrl(mtd, NAND_CMD_READSTART,
+                               NAND_NCE | NAND_CLE | NAND_CTRL_CHANGE);
+                chip->cmd_ctrl(mtd, NAND_CMD_NONE,
+                               NAND_NCE | NAND_CTRL_CHANGE);
+
+                /* This applies to read commands */
         default:
                 /*
                  * If we don't have access to the busy pin, we apply the given
                  * command delay
-                */
-                if (!this->dev_ready) {
-                        udelay (this->chip_delay);
+                 */
+                if (!chip->dev_ready) {
+                        udelay(chip->chip_delay);
                         return;
                 }
         }
 
         /* Apply this short delay always to ensure that we do wait tWB in
          * any case on any machine. */
-        ndelay (100);
+        ndelay(100);
 
         nand_wait_ready(mtd);
 }
@@ -763,34 +662,28 @@ static void nand_command_lp (struct mtd_info *mtd, unsigned command, int column,
  *
  * Get the device and lock it for exclusive access
  */
-static int nand_get_device (struct nand_chip *this, struct mtd_info *mtd, int new_state)
+static int
+nand_get_device(struct nand_chip *chip, struct mtd_info *mtd, int new_state)
 {
-        struct nand_chip *active;
-        spinlock_t *lock;
-        wait_queue_head_t *wq;
-        DECLARE_WAITQUEUE (wait, current);
-
-        lock = (this->controller) ? &this->controller->lock : &this->chip_lock;
-        wq = (this->controller) ? &this->controller->wq : &this->wq;
-retry:
-        active = this;
+        spinlock_t *lock = &chip->controller->lock;
+        wait_queue_head_t *wq = &chip->controller->wq;
+        DECLARE_WAITQUEUE(wait, current);
+ retry:
         spin_lock(lock);
 
         /* Hardware controller shared among independend devices */
-        if (this->controller) {
-                if (this->controller->active)
-                        active = this->controller->active;
-                else
-                        this->controller->active = this;
-        }
-        if (active == this && this->state == FL_READY) {
-                this->state = new_state;
+        /* Hardware controller shared among independend devices */
+        if (!chip->controller->active)
+                chip->controller->active = chip;
+
+        if (chip->controller->active == chip && chip->state == FL_READY) {
+                chip->state = new_state;
                 spin_unlock(lock);
                 return 0;
         }
         if (new_state == FL_PM_SUSPENDED) {
                 spin_unlock(lock);
-                return (this->state == FL_PM_SUSPENDED) ? 0 : -EAGAIN;
+                return (chip->state == FL_PM_SUSPENDED) ? 0 : -EAGAIN;
         }
         set_current_state(TASK_UNINTERRUPTIBLE);
         add_wait_queue(wq, &wait);
@@ -804,540 +697,339 @@ retry:
  * nand_wait - [DEFAULT]  wait until the command is done
  * @mtd:        MTD device structure
  * @this:       NAND chip structure
- * @state:      state to select the max. timeout value
  *
  * Wait for command done. This applies to erase and program only
  * Erase can take up to 400ms and program up to 20ms according to
  * general NAND and SmartMedia specs
  *
 */
-static int nand_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
+static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
 {
 
-        unsigned long   timeo = jiffies;
-        int     status;
+        unsigned long timeo = jiffies;
+        int status, state = chip->state;
 
         if (state == FL_ERASING)
-                 timeo += (HZ * 400) / 1000;
+                timeo += (HZ * 400) / 1000;
         else
-                 timeo += (HZ * 20) / 1000;
+                timeo += (HZ * 20) / 1000;
 
         led_trigger_event(nand_led_trigger, LED_FULL);
 
         /* Apply this short delay always to ensure that we do wait tWB in
          * any case on any machine. */
-        ndelay (100);
+        ndelay(100);
 
-        if ((state == FL_ERASING) && (this->options & NAND_IS_AND))
-                this->cmdfunc (mtd, NAND_CMD_STATUS_MULTI, -1, -1);
+        if ((state == FL_ERASING) && (chip->options & NAND_IS_AND))
+                chip->cmdfunc(mtd, NAND_CMD_STATUS_MULTI, -1, -1);
         else
-                this->cmdfunc (mtd, NAND_CMD_STATUS, -1, -1);
+                chip->cmdfunc(mtd, NAND_CMD_STATUS, -1, -1);
 
         while (time_before(jiffies, timeo)) {
-                /* Check, if we were interrupted */
-                if (this->state != state)
-                        return 0;
-
-                if (this->dev_ready) {
-                        if (this->dev_ready(mtd))
+                if (chip->dev_ready) {
+                        if (chip->dev_ready(mtd))
                                 break;
                 } else {
-                        if (this->read_byte(mtd) & NAND_STATUS_READY)
+                        if (chip->read_byte(mtd) & NAND_STATUS_READY)
                                 break;
                 }
                 cond_resched();
         }
         led_trigger_event(nand_led_trigger, LED_OFF);
 
-        status = (int) this->read_byte(mtd);
+        status = (int)chip->read_byte(mtd);
         return status;
 }
 
 /**
- * nand_write_page - [GENERIC] write one page
- * @mtd:        MTD device structure
- * @this:       NAND chip structure
- * @page:       startpage inside the chip, must be called with (page & this->pagemask)
- * @oob_buf:    out of band data buffer
- * @oobsel:     out of band selecttion structre
- * @cached:     1 = enable cached programming if supported by chip
- *
- * Nand_page_program function is used for write and writev !
- * This function will always program a full page of data
- * If you call it with a non page aligned buffer, you're lost :)
- *
- * Cached programming is not supported yet.
+ * nand_read_page_raw - [Intern] read raw page data without ecc
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        buffer to store read data
  */
-static int nand_write_page (struct mtd_info *mtd, struct nand_chip *this, int page,
-        u_char *oob_buf,  struct nand_oobinfo *oobsel, int cached)
+static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                              uint8_t *buf)
 {
-        int     i, status;
-        u_char  ecc_code[32];
-        int     eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE;
-        int     *oob_config = oobsel->eccpos;
-        int     datidx = 0, eccidx = 0, eccsteps = this->eccsteps;
-        int     eccbytes = 0;
-
-        /* FIXME: Enable cached programming */
-        cached = 0;
+        chip->read_buf(mtd, buf, mtd->writesize);
+        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+        return 0;
+}
 
-        /* Send command to begin auto page programming */
-        this->cmdfunc (mtd, NAND_CMD_SEQIN, 0x00, page);
+/**
+ * nand_read_page_swecc - {REPLACABLE] software ecc based page read function
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        buffer to store read data
+ */
+static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
+                                uint8_t *buf)
+{
+        int i, eccsize = chip->ecc.size;
+        int eccbytes = chip->ecc.bytes;
+        int eccsteps = chip->ecc.steps;
+        uint8_t *p = buf;
+        uint8_t *ecc_calc = chip->buffers.ecccalc;
+        uint8_t *ecc_code = chip->buffers.ecccode;
+        int *eccpos = chip->ecc.layout->eccpos;
 
-        /* Write out complete page of data, take care of eccmode */
-        switch (eccmode) {
-        /* No ecc, write all */
-        case NAND_ECC_NONE:
-                printk (KERN_WARNING "Writing data without ECC to NAND-FLASH is not recommended\n");
-                this->write_buf(mtd, this->data_poi, mtd->oobblock);
-                break;
+        nand_read_page_raw(mtd, chip, buf);
 
-        /* Software ecc 3/256, write all */
-        case NAND_ECC_SOFT:
-                for (; eccsteps; eccsteps--) {
-                        this->calculate_ecc(mtd, &this->data_poi[datidx], ecc_code);
-                        for (i = 0; i < 3; i++, eccidx++)
-                                oob_buf[oob_config[eccidx]] = ecc_code[i];
-                        datidx += this->eccsize;
-                }
-                this->write_buf(mtd, this->data_poi, mtd->oobblock);
-                break;
-        default:
-                eccbytes = this->eccbytes;
-                for (; eccsteps; eccsteps--) {
-                        /* enable hardware ecc logic for write */
-                        this->enable_hwecc(mtd, NAND_ECC_WRITE);
-                        this->write_buf(mtd, &this->data_poi[datidx], this->eccsize);
-                        this->calculate_ecc(mtd, &this->data_poi[datidx], ecc_code);
-                        for (i = 0; i < eccbytes; i++, eccidx++)
-                                oob_buf[oob_config[eccidx]] = ecc_code[i];
-                        /* If the hardware ecc provides syndromes then
-                         * the ecc code must be written immidiately after
-                         * the data bytes (words) */
-                        if (this->options & NAND_HWECC_SYNDROME)
-                                this->write_buf(mtd, ecc_code, eccbytes);
-                        datidx += this->eccsize;
-                }
-                break;
-        }
+        for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
+                chip->ecc.calculate(mtd, p, &ecc_calc[i]);
 
-        /* Write out OOB data */
-        if (this->options & NAND_HWECC_SYNDROME)
-                this->write_buf(mtd, &oob_buf[oobsel->eccbytes], mtd->oobsize - oobsel->eccbytes);
-        else
-                this->write_buf(mtd, oob_buf, mtd->oobsize);
+        for (i = 0; i < chip->ecc.total; i++)
+                ecc_code[i] = chip->oob_poi[eccpos[i]];
 
-        /* Send command to actually program the data */
-        this->cmdfunc (mtd, cached ? NAND_CMD_CACHEDPROG : NAND_CMD_PAGEPROG, -1, -1);
+        eccsteps = chip->ecc.steps;
+        p = buf;
 
-        if (!cached) {
-                /* call wait ready function */
-                status = this->waitfunc (mtd, this, FL_WRITING);
+        for (i = 0 ; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+                int stat;
 
-                /* See if operation failed and additional status checks are available */
-                if ((status & NAND_STATUS_FAIL) && (this->errstat)) {
-                        status = this->errstat(mtd, this, FL_WRITING, status, page);
-                }
-
-                /* See if device thinks it succeeded */
-                if (status & NAND_STATUS_FAIL) {
-                        DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write, page 0x%08x, ", __FUNCTION__, page);
-                        return -EIO;
-                }
-        } else {
-                /* FIXME: Implement cached programming ! */
-                /* wait until cache is ready*/
-                // status = this->waitfunc (mtd, this, FL_CACHEDRPG);
+                stat = chip->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]);
+                if (stat == -1)
+                        mtd->ecc_stats.failed++;
+                else
+                        mtd->ecc_stats.corrected += stat;
         }
         return 0;
 }
 
-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
 /**
- * nand_verify_pages - [GENERIC] verify the chip contents after a write
- * @mtd:        MTD device structure
- * @this:       NAND chip structure
- * @page:       startpage inside the chip, must be called with (page & this->pagemask)
- * @numpages:   number of pages to verify
- * @oob_buf:    out of band data buffer
- * @oobsel:     out of band selecttion structre
- * @chipnr:     number of the current chip
- * @oobmode:    1 = full buffer verify, 0 = ecc only
+ * nand_read_page_hwecc - {REPLACABLE] hardware ecc based page read function
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        buffer to store read data
  *
- * The NAND device assumes that it is always writing to a cleanly erased page.
- * Hence, it performs its internal write verification only on bits that
- * transitioned from 1 to 0. The device does NOT verify the whole page on a
- * byte by byte basis. It is possible that the page was not completely erased
- * or the page is becoming unusable due to wear. The read with ECC would catch
- * the error later when the ECC page check fails, but we would rather catch
- * it early in the page write stage. Better to write no data than invalid data.
+ * Not for syndrome calculating ecc controllers which need a special oob layout
  */
-static int nand_verify_pages (struct mtd_info *mtd, struct nand_chip *this, int page, int numpages,
-        u_char *oob_buf, struct nand_oobinfo *oobsel, int chipnr, int oobmode)
+static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
+                                uint8_t *buf)
 {
-        int     i, j, datidx = 0, oobofs = 0, res = -EIO;
-        int     eccsteps = this->eccsteps;
-        int     hweccbytes;
-        u_char  oobdata[64];
-
-        hweccbytes = (this->options & NAND_HWECC_SYNDROME) ? (oobsel->eccbytes / eccsteps) : 0;
-
-        /* Send command to read back the first page */
-        this->cmdfunc (mtd, NAND_CMD_READ0, 0, page);
-
-        for(;;) {
-                for (j = 0; j < eccsteps; j++) {
-                        /* Loop through and verify the data */
-                        if (this->verify_buf(mtd, &this->data_poi[datidx], mtd->eccsize)) {
-                                DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);
-                                goto out;
-                        }
-                        datidx += mtd->eccsize;
-                        /* Have we a hw generator layout ? */
-                        if (!hweccbytes)
-                                continue;
-                        if (this->verify_buf(mtd, &this->oob_buf[oobofs], hweccbytes)) {
-                                DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);
-                                goto out;
-                        }
-                        oobofs += hweccbytes;
-                }
+        int i, eccsize = chip->ecc.size;
+        int eccbytes = chip->ecc.bytes;
+        int eccsteps = chip->ecc.steps;
+        uint8_t *p = buf;
+        uint8_t *ecc_calc = chip->buffers.ecccalc;
+        uint8_t *ecc_code = chip->buffers.ecccode;
+        int *eccpos = chip->ecc.layout->eccpos;
+
+        for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+                chip->ecc.hwctl(mtd, NAND_ECC_READ);
+                chip->read_buf(mtd, p, eccsize);
+                chip->ecc.calculate(mtd, p, &ecc_calc[i]);
+        }
+        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
 
-                /* check, if we must compare all data or if we just have to
-                 * compare the ecc bytes
-                 */
-                if (oobmode) {
-                        if (this->verify_buf(mtd, &oob_buf[oobofs], mtd->oobsize - hweccbytes * eccsteps)) {
-                                DEBUG (MTD_DEBUG_LEVEL0, "%s: " "Failed write verify, page 0x%08x ", __FUNCTION__, page);
-                                goto out;
-                        }
-                } else {
-                        /* Read always, else autoincrement fails */
-                        this->read_buf(mtd, oobdata, mtd->oobsize - hweccbytes * eccsteps);
-
-                        if (oobsel->useecc != MTD_NANDECC_OFF && !hweccbytes) {
-                                int ecccnt = oobsel->eccbytes;
-
-                                for (i = 0; i < ecccnt; i++) {
-                                        int idx = oobsel->eccpos[i];
-                                        if (oobdata[idx] != oob_buf[oobofs + idx] ) {
-                                                DEBUG (MTD_DEBUG_LEVEL0,
-                                                "%s: Failed ECC write "
-                                                "verify, page 0x%08x, " "%6i bytes were succesful\n", __FUNCTION__, page, i);
-                                                goto out;
-                                        }
-                                }
-                        }
-                }
-                oobofs += mtd->oobsize - hweccbytes * eccsteps;
-                page++;
-                numpages--;
-
-                /* Apply delay or wait for ready/busy pin
-                 * Do this before the AUTOINCR check, so no problems
-                 * arise if a chip which does auto increment
-                 * is marked as NOAUTOINCR by the board driver.
-                 * Do this also before returning, so the chip is
-                 * ready for the next command.
-                */
-                if (!this->dev_ready)
-                        udelay (this->chip_delay);
-                else
-                        nand_wait_ready(mtd);
+        for (i = 0; i < chip->ecc.total; i++)
+                ecc_code[i] = chip->oob_poi[eccpos[i]];
 
-                /* All done, return happy */
-                if (!numpages)
-                        return 0;
+        eccsteps = chip->ecc.steps;
+        p = buf;
 
+        for (i = 0 ; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+                int stat;
 
-                /* Check, if the chip supports auto page increment */
-                if (!NAND_CANAUTOINCR(this))
-                        this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);
+                stat = chip->ecc.correct(mtd, p, &ecc_code[i], &ecc_calc[i]);
+                if (stat == -1)
+                        mtd->ecc_stats.failed++;
+                else
+                        mtd->ecc_stats.corrected += stat;
         }
-        /*
-         * Terminate the read command. We come here in case of an error
-         * So we must issue a reset command.
-         */
-out:
-        this->cmdfunc (mtd, NAND_CMD_RESET, -1, -1);
-        return res;
+        return 0;
 }
-#endif
 
 /**
- * nand_read - [MTD Interface] MTD compability function for nand_do_read_ecc
- * @mtd:        MTD device structure
- * @from:       offset to read from
- * @len:        number of bytes to read
- * @retlen:     pointer to variable to store the number of read bytes
- * @buf:        the databuffer to put data
+ * nand_read_page_syndrome - {REPLACABLE] hardware ecc syndrom based page read
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        buffer to store read data
  *
- * This function simply calls nand_do_read_ecc with oob buffer and oobsel = NULL
- * and flags = 0xff
+ * The hw generator calculates the error syndrome automatically. Therefor
+ * we need a special oob layout and handling.
  */
-static int nand_read (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf)
+static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
+                                   uint8_t *buf)
 {
-        return nand_do_read_ecc (mtd, from, len, retlen, buf, NULL, &mtd->oobinfo, 0xff);
-}
+        int i, eccsize = chip->ecc.size;
+        int eccbytes = chip->ecc.bytes;
+        int eccsteps = chip->ecc.steps;
+        uint8_t *p = buf;
+        uint8_t *oob = chip->oob_poi;
+
+        for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+                int stat;
+
+                chip->ecc.hwctl(mtd, NAND_ECC_READ);
+                chip->read_buf(mtd, p, eccsize);
+
+                if (chip->ecc.prepad) {
+                        chip->read_buf(mtd, oob, chip->ecc.prepad);
+                        oob += chip->ecc.prepad;
+                }
+
+                chip->ecc.hwctl(mtd, NAND_ECC_READSYN);
+                chip->read_buf(mtd, oob, eccbytes);
+                stat = chip->ecc.correct(mtd, p, oob, NULL);
+
+                if (stat == -1)
+                        mtd->ecc_stats.failed++;
+                else
+                        mtd->ecc_stats.corrected += stat;
+
+                oob += eccbytes;
+
+                if (chip->ecc.postpad) {
+                        chip->read_buf(mtd, oob, chip->ecc.postpad);
+                        oob += chip->ecc.postpad;
+                }
+        }
+
+        /* Calculate remaining oob bytes */
+        i = mtd->oobsize - (oob - chip->oob_poi);
+        if (i)
+                chip->read_buf(mtd, oob, i);
 
+        return 0;
+}
 
 /**
- * nand_read_ecc - [MTD Interface] MTD compability function for nand_do_read_ecc
- * @mtd:        MTD device structure
- * @from:       offset to read from
- * @len:        number of bytes to read
- * @retlen:     pointer to variable to store the number of read bytes
- * @buf:        the databuffer to put data
- * @oob_buf:    filesystem supplied oob data buffer
- * @oobsel:     oob selection structure
- *
- * This function simply calls nand_do_read_ecc with flags = 0xff
+ * nand_transfer_oob - [Internal] Transfer oob to client buffer
+ * @chip:       nand chip structure
+ * @ops:        oob ops structure
  */
-static int nand_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                          size_t * retlen, u_char * buf, u_char * oob_buf, struct nand_oobinfo *oobsel)
+static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob,
+                                  struct mtd_oob_ops *ops)
 {
-        /* use userspace supplied oobinfo, if zero */
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
-        return nand_do_read_ecc(mtd, from, len, retlen, buf, oob_buf, oobsel, 0xff);
+        size_t len = ops->ooblen;
+
+        switch(ops->mode) {
+
+        case MTD_OOB_PLACE:
+        case MTD_OOB_RAW:
+                memcpy(oob, chip->oob_poi + ops->ooboffs, len);
+                return oob + len;
+
+        case MTD_OOB_AUTO: {
+                struct nand_oobfree *free = chip->ecc.layout->oobfree;
+                uint32_t boffs = 0, roffs = ops->ooboffs;
+                size_t bytes = 0;
+
+                for(; free->length && len; free++, len -= bytes) {
+                        /* Read request not from offset 0 ? */
+                        if (unlikely(roffs)) {
+                                if (roffs >= free->length) {
+                                        roffs -= free->length;
+                                        continue;
+                                }
+                                boffs = free->offset + roffs;
+                                bytes = min_t(size_t, len,
+                                              (free->length - roffs));
+                                roffs = 0;
+                        } else {
+                                bytes = min_t(size_t, len, free->length);
+                                boffs = free->offset;
+                        }
+                        memcpy(oob, chip->oob_poi + boffs, bytes);
+                        oob += bytes;
+                }
+                return oob;
+        }
+        default:
+                BUG();
+        }
+        return NULL;
 }
 
-
 /**
- * nand_do_read_ecc - [MTD Interface] Read data with ECC
+ * nand_do_read_ops - [Internal] Read data with ECC
+ *
  * @mtd:        MTD device structure
  * @from:       offset to read from
- * @len:        number of bytes to read
- * @retlen:     pointer to variable to store the number of read bytes
- * @buf:        the databuffer to put data
- * @oob_buf:    filesystem supplied oob data buffer (can be NULL)
- * @oobsel:     oob selection structure
- * @flags:      flag to indicate if nand_get_device/nand_release_device should be preformed
- *              and how many corrected error bits are acceptable:
- *                bits 0..7 - number of tolerable errors
- *                bit  8    - 0 == do not get/release chip, 1 == get/release chip
  *
- * NAND read with ECC
+ * Internal function. Called with chip held.
  */
-int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
-                             size_t * retlen, u_char * buf, u_char * oob_buf,
-                             struct nand_oobinfo *oobsel, int flags)
+static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
+                            struct mtd_oob_ops *ops)
 {
+        int chipnr, page, realpage, col, bytes, aligned;
+        struct nand_chip *chip = mtd->priv;
+        struct mtd_ecc_stats stats;
+        int blkcheck = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;
+        int sndcmd = 1;
+        int ret = 0;
+        uint32_t readlen = ops->len;
+        uint8_t *bufpoi, *oob, *buf;
 
-        int i, j, col, realpage, page, end, ecc, chipnr, sndcmd = 1;
-        int read = 0, oob = 0, ecc_status = 0, ecc_failed = 0;
-        struct nand_chip *this = mtd->priv;
-        u_char *data_poi, *oob_data = oob_buf;
-        u_char ecc_calc[32];
-        u_char ecc_code[32];
-        int eccmode, eccsteps;
-        int     *oob_config, datidx;
-        int     blockcheck = (1 << (this->phys_erase_shift - this->page_shift)) - 1;
-        int     eccbytes;
-        int     compareecc = 1;
-        int     oobreadlen;
-
-
-        DEBUG (MTD_DEBUG_LEVEL3, "nand_read_ecc: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
-
-        /* Do not allow reads past end of device */
-        if ((from + len) > mtd->size) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: Attempt read beyond end of device\n");
-                *retlen = 0;
-                return -EINVAL;
-        }
-
-        /* Grab the lock and see if the device is available */
-        if (flags & NAND_GET_DEVICE)
-                nand_get_device (this, mtd, FL_READING);
-
-        /* Autoplace of oob data ? Use the default placement scheme */
-        if (oobsel->useecc == MTD_NANDECC_AUTOPLACE)
-                oobsel = this->autooob;
-
-        eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE;
-        oob_config = oobsel->eccpos;
-
-        /* Select the NAND device */
-        chipnr = (int)(from >> this->chip_shift);
-        this->select_chip(mtd, chipnr);
-
-        /* First we calculate the starting page */
-        realpage = (int) (from >> this->page_shift);
-        page = realpage & this->pagemask;
-
-        /* Get raw starting column */
-        col = from & (mtd->oobblock - 1);
-
-        end = mtd->oobblock;
-        ecc = this->eccsize;
-        eccbytes = this->eccbytes;
-
-        if ((eccmode == NAND_ECC_NONE) || (this->options & NAND_HWECC_SYNDROME))
-                compareecc = 0;
-
-        oobreadlen = mtd->oobsize;
-        if (this->options & NAND_HWECC_SYNDROME)
-                oobreadlen -= oobsel->eccbytes;
+        stats = mtd->ecc_stats;
 
-        /* Loop until all data read */
-        while (read < len) {
+        chipnr = (int)(from >> chip->chip_shift);
+        chip->select_chip(mtd, chipnr);
 
-                int aligned = (!col && (len - read) >= end);
-                /*
-                 * If the read is not page aligned, we have to read into data buffer
-                 * due to ecc, else we read into return buffer direct
-                 */
-                if (aligned)
-                        data_poi = &buf[read];
-                else
-                        data_poi = this->data_buf;
+        realpage = (int)(from >> chip->page_shift);
+        page = realpage & chip->pagemask;
 
-                /* Check, if we have this page in the buffer
-                 *
-                 * FIXME: Make it work when we must provide oob data too,
-                 * check the usage of data_buf oob field
-                 */
-                if (realpage == this->pagebuf && !oob_buf) {
-                        /* aligned read ? */
-                        if (aligned)
-                                memcpy (data_poi, this->data_buf, end);
-                        goto readdata;
-                }
+        col = (int)(from & (mtd->writesize - 1));
+        chip->oob_poi = chip->buffers.oobrbuf;
 
-                /* Check, if we must send the read command */
-                if (sndcmd) {
-                        this->cmdfunc (mtd, NAND_CMD_READ0, 0x00, page);
-                        sndcmd = 0;
-                }
+        buf = ops->datbuf;
+        oob = ops->oobbuf;
 
-                /* get oob area, if we have no oob buffer from fs-driver */
-                if (!oob_buf || oobsel->useecc == MTD_NANDECC_AUTOPLACE ||
-                        oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
-                        oob_data = &this->data_buf[end];
+        while(1) {
+                bytes = min(mtd->writesize - col, readlen);
+                aligned = (bytes == mtd->writesize);
 
-                eccsteps = this->eccsteps;
+                /* Is the current page in the buffer ? */
+                if (realpage != chip->pagebuf || oob) {
+                        bufpoi = aligned ? buf : chip->buffers.databuf;
 
-                switch (eccmode) {
-                case NAND_ECC_NONE: {   /* No ECC, Read in a page */
-                        static unsigned long lastwhinge = 0;
-                        if ((lastwhinge / HZ) != (jiffies / HZ)) {
-                                printk (KERN_WARNING "Reading data from NAND FLASH without ECC is not recommended\n");
-                                lastwhinge = jiffies;
+                        if (likely(sndcmd)) {
+                                chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page);
+                                sndcmd = 0;
                         }
-                        this->read_buf(mtd, data_poi, end);
-                        break;
-                }
 
-                case NAND_ECC_SOFT:     /* Software ECC 3/256: Read in a page + oob data */
-                        this->read_buf(mtd, data_poi, end);
-                        for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=3, datidx += ecc)
-                                this->calculate_ecc(mtd, &data_poi[datidx], &ecc_calc[i]);
-                        break;
+                        /* Now read the page into the buffer */
+                        ret = chip->ecc.read_page(mtd, chip, bufpoi);
+                        if (ret < 0)
+                                break;
 
-                default:
-                        for (i = 0, datidx = 0; eccsteps; eccsteps--, i+=eccbytes, datidx += ecc) {
-                                this->enable_hwecc(mtd, NAND_ECC_READ);
-                                this->read_buf(mtd, &data_poi[datidx], ecc);
-
-                                /* HW ecc with syndrome calculation must read the
-                                 * syndrome from flash immidiately after the data */
-                                if (!compareecc) {
-                                        /* Some hw ecc generators need to know when the
-                                         * syndrome is read from flash */
-                                        this->enable_hwecc(mtd, NAND_ECC_READSYN);
-                                        this->read_buf(mtd, &oob_data[i], eccbytes);
-                                        /* We calc error correction directly, it checks the hw
-                                         * generator for an error, reads back the syndrome and
-                                         * does the error correction on the fly */
-                                        ecc_status = this->correct_data(mtd, &data_poi[datidx], &oob_data[i], &ecc_code[i]);
-                                        if ((ecc_status == -1) || (ecc_status > (flags && 0xff))) {
-                                                DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: "
-                                                        "Failed ECC read, page 0x%08x on chip %d\n", page, chipnr);
-                                                ecc_failed++;
-                                        }
-                                } else {
-                                        this->calculate_ecc(mtd, &data_poi[datidx], &ecc_calc[i]);
-                                }
+                        /* Transfer not aligned data */
+                        if (!aligned) {
+                                chip->pagebuf = realpage;
+                                memcpy(buf, chip->buffers.databuf + col, bytes);
                         }
-                        break;
-                }
-
-                /* read oobdata */
-                this->read_buf(mtd, &oob_data[mtd->oobsize - oobreadlen], oobreadlen);
-
-                /* Skip ECC check, if not requested (ECC_NONE or HW_ECC with syndromes) */
-                if (!compareecc)
-                        goto readoob;
-
-                /* Pick the ECC bytes out of the oob data */
-                for (j = 0; j < oobsel->eccbytes; j++)
-                        ecc_code[j] = oob_data[oob_config[j]];
 
-                /* correct data, if neccecary */
-                for (i = 0, j = 0, datidx = 0; i < this->eccsteps; i++, datidx += ecc) {
-                        ecc_status = this->correct_data(mtd, &data_poi[datidx], &ecc_code[j], &ecc_calc[j]);
+                        buf += bytes;
 
-                        /* Get next chunk of ecc bytes */
-                        j += eccbytes;
-
-                        /* Check, if we have a fs supplied oob-buffer,
-                         * This is the legacy mode. Used by YAFFS1
-                         * Should go away some day
-                         */
-                        if (oob_buf && oobsel->useecc == MTD_NANDECC_PLACE) {
-                                int *p = (int *)(&oob_data[mtd->oobsize]);
-                                p[i] = ecc_status;
+                        if (unlikely(oob)) {
+                                /* Raw mode does data:oob:data:oob */
+                                if (ops->mode != MTD_OOB_RAW)
+                                        oob = nand_transfer_oob(chip, oob, ops);
+                                else
+                                        buf = nand_transfer_oob(chip, buf, ops);
                         }
 
-                        if ((ecc_status == -1) || (ecc_status > (flags && 0xff))) {
-                                DEBUG (MTD_DEBUG_LEVEL0, "nand_read_ecc: " "Failed ECC read, page 0x%08x\n", page);
-                                ecc_failed++;
+                        if (!(chip->options & NAND_NO_READRDY)) {
+                                /*
+                                 * Apply delay or wait for ready/busy pin. Do
+                                 * this before the AUTOINCR check, so no
+                                 * problems arise if a chip which does auto
+                                 * increment is marked as NOAUTOINCR by the
+                                 * board driver.
+                                 */
+                                if (!chip->dev_ready)
+                                        udelay(chip->chip_delay);
+                                else
+                                        nand_wait_ready(mtd);
                         }
+                } else {
+                        memcpy(buf, chip->buffers.databuf + col, bytes);
+                        buf += bytes;
                 }
 
-        readoob:
-                /* check, if we have a fs supplied oob-buffer */
-                if (oob_buf) {
-                        /* without autoplace. Legacy mode used by YAFFS1 */
-                        switch(oobsel->useecc) {
-                        case MTD_NANDECC_AUTOPLACE:
-                        case MTD_NANDECC_AUTOPL_USR:
-                                /* Walk through the autoplace chunks */
-                                for (i = 0; oobsel->oobfree[i][1]; i++) {
-                                        int from = oobsel->oobfree[i][0];
-                                        int num = oobsel->oobfree[i][1];
-                                        memcpy(&oob_buf[oob], &oob_data[from], num);
-                                        oob += num;
-                                }
-                                break;
-                        case MTD_NANDECC_PLACE:
-                                /* YAFFS1 legacy mode */
-                                oob_data += this->eccsteps * sizeof (int);
-                        default:
-                                oob_data += mtd->oobsize;
-                        }
-                }
-        readdata:
-                /* Partial page read, transfer data into fs buffer */
-                if (!aligned) {
-                        for (j = col; j < end && read < len; j++)
-                                buf[read++] = data_poi[j];
-                        this->pagebuf = realpage;
-                } else
-                        read += mtd->oobblock;
-
-                /* Apply delay or wait for ready/busy pin
-                 * Do this before the AUTOINCR check, so no problems
-                 * arise if a chip which does auto increment
-                 * is marked as NOAUTOINCR by the board driver.
-                */
-                if (!this->dev_ready)
-                        udelay (this->chip_delay);
-                else
-                        nand_wait_ready(mtd);
+                readlen -= bytes;
 
-                if (read == len)
+                if (!readlen)
                         break;
 
                 /* For subsequent reads align to page boundary. */
@@ -1345,701 +1037,775 @@ int nand_do_read_ecc (struct mtd_info *mtd, loff_t from, size_t len,
                 /* Increment page address */
                 realpage++;
 
-                page = realpage & this->pagemask;
+                page = realpage & chip->pagemask;
                 /* Check, if we cross a chip boundary */
                 if (!page) {
                         chipnr++;
-                        this->select_chip(mtd, -1);
-                        this->select_chip(mtd, chipnr);
+                        chip->select_chip(mtd, -1);
+                        chip->select_chip(mtd, chipnr);
                 }
+
                 /* Check, if the chip supports auto page increment
                  * or if we have hit a block boundary.
-                */
-                if (!NAND_CANAUTOINCR(this) || !(page & blockcheck))
+                 */
+                if (!NAND_CANAUTOINCR(chip) || !(page & blkcheck))
                         sndcmd = 1;
         }
 
-        /* Deselect and wake up anyone waiting on the device */
-        if (flags & NAND_GET_DEVICE)
-                nand_release_device(mtd);
+        ops->retlen = ops->len - (size_t) readlen;
 
-        /*
-         * Return success, if no ECC failures, else -EBADMSG
-         * fs driver will take care of that, because
-         * retlen == desired len and result == -EBADMSG
-         */
-        *retlen = read;
-        return ecc_failed ? -EBADMSG : 0;
+        if (ret)
+                return ret;
+
+        if (mtd->ecc_stats.failed - stats.failed)
+                return -EBADMSG;
+
+        return  mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0;
 }
 
 /**
- * nand_read_oob - [MTD Interface] NAND read out-of-band
+ * nand_read - [MTD Interface] MTD compability function for nand_do_read_ecc
  * @mtd:        MTD device structure
  * @from:       offset to read from
  * @len:        number of bytes to read
  * @retlen:     pointer to variable to store the number of read bytes
  * @buf:        the databuffer to put data
  *
- * NAND read out-of-band data from the spare area
+ * Get hold of the chip and call nand_do_read
  */
-static int nand_read_oob (struct mtd_info *mtd, loff_t from, size_t len, size_t * retlen, u_char * buf)
+static int nand_read(struct mtd_info *mtd, loff_t from, size_t len,
+                     size_t *retlen, uint8_t *buf)
 {
-        int i, col, page, chipnr;
-        struct nand_chip *this = mtd->priv;
-        int     blockcheck = (1 << (this->phys_erase_shift - this->page_shift)) - 1;
+        struct nand_chip *chip = mtd->priv;
+        int ret;
 
-        DEBUG (MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+        /* Do not allow reads past end of device */
+        if ((from + len) > mtd->size)
+                return -EINVAL;
+        if (!len)
+                return 0;
 
-        /* Shift to get page */
-        page = (int)(from >> this->page_shift);
-        chipnr = (int)(from >> this->chip_shift);
+        nand_get_device(chip, mtd, FL_READING);
 
-        /* Mask to get column */
-        col = from & (mtd->oobsize - 1);
+        chip->ops.len = len;
+        chip->ops.datbuf = buf;
+        chip->ops.oobbuf = NULL;
 
-        /* Initialize return length value */
-        *retlen = 0;
+        ret = nand_do_read_ops(mtd, from, &chip->ops);
 
-        /* Do not allow reads past end of device */
-        if ((from + len) > mtd->size) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_read_oob: Attempt read beyond end of device\n");
-                *retlen = 0;
-                return -EINVAL;
+        nand_release_device(mtd);
+
+        *retlen = chip->ops.retlen;
+        return ret;
+}
+
+/**
+ * nand_read_oob_std - [REPLACABLE] the most common OOB data read function
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @page:       page number to read
+ * @sndcmd:     flag whether to issue read command or not
+ */
+static int nand_read_oob_std(struct mtd_info *mtd, struct nand_chip *chip,
+                             int page, int sndcmd)
+{
+        if (sndcmd) {
+                chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
+                sndcmd = 0;
         }
+        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+        return sndcmd;
+}
 
-        /* Grab the lock and see if the device is available */
-        nand_get_device (this, mtd , FL_READING);
+/**
+ * nand_read_oob_syndrome - [REPLACABLE] OOB data read function for HW ECC
+ *                          with syndromes
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @page:       page number to read
+ * @sndcmd:     flag whether to issue read command or not
+ */
+static int nand_read_oob_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
+                                  int page, int sndcmd)
+{
+        uint8_t *buf = chip->oob_poi;
+        int length = mtd->oobsize;
+        int chunk = chip->ecc.bytes + chip->ecc.prepad + chip->ecc.postpad;
+        int eccsize = chip->ecc.size;
+        uint8_t *bufpoi = buf;
+        int i, toread, sndrnd = 0, pos;
+
+        chip->cmdfunc(mtd, NAND_CMD_READ0, chip->ecc.size, page);
+        for (i = 0; i < chip->ecc.steps; i++) {
+                if (sndrnd) {
+                        pos = eccsize + i * (eccsize + chunk);
+                        if (mtd->writesize > 512)
+                                chip->cmdfunc(mtd, NAND_CMD_RNDOUT, pos, -1);
+                        else
+                                chip->cmdfunc(mtd, NAND_CMD_READ0, pos, page);
+                } else
+                        sndrnd = 1;
+                toread = min_t(int, length, chunk);
+                chip->read_buf(mtd, bufpoi, toread);
+                bufpoi += toread;
+                length -= toread;
+        }
+        if (length > 0)
+                chip->read_buf(mtd, bufpoi, length);
 
-        /* Select the NAND device */
-        this->select_chip(mtd, chipnr);
+        return 1;
+}
+
+/**
+ * nand_write_oob_std - [REPLACABLE] the most common OOB data write function
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @page:       page number to write
+ */
+static int nand_write_oob_std(struct mtd_info *mtd, struct nand_chip *chip,
+                              int page)
+{
+        int status = 0;
+        const uint8_t *buf = chip->oob_poi;
+        int length = mtd->oobsize;
+
+        chip->cmdfunc(mtd, NAND_CMD_SEQIN, mtd->writesize, page);
+        chip->write_buf(mtd, buf, length);
+        /* Send command to program the OOB data */
+        chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
+
+        status = chip->waitfunc(mtd, chip);
+
+        return status;
+}
+
+/**
+ * nand_write_oob_syndrome - [REPLACABLE] OOB data write function for HW ECC
+ *                           with syndrome - only for large page flash !
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @page:       page number to write
+ */
+static int nand_write_oob_syndrome(struct mtd_info *mtd,
+                                   struct nand_chip *chip, int page)
+{
+        int chunk = chip->ecc.bytes + chip->ecc.prepad + chip->ecc.postpad;
+        int eccsize = chip->ecc.size, length = mtd->oobsize;
+        int i, len, pos, status = 0, sndcmd = 0, steps = chip->ecc.steps;
+        const uint8_t *bufpoi = chip->oob_poi;
 
-        /* Send the read command */
-        this->cmdfunc (mtd, NAND_CMD_READOOB, col, page & this->pagemask);
         /*
-         * Read the data, if we read more than one page
-         * oob data, let the device transfer the data !
+         * data-ecc-data-ecc ... ecc-oob
+         * or
+         * data-pad-ecc-pad-data-pad .... ecc-pad-oob
          */
-        i = 0;
-        while (i < len) {
-                int thislen = mtd->oobsize - col;
-                thislen = min_t(int, thislen, len);
-                this->read_buf(mtd, &buf[i], thislen);
-                i += thislen;
-
-                /* Read more ? */
-                if (i < len) {
-                        page++;
-                        col = 0;
-
-                        /* Check, if we cross a chip boundary */
-                        if (!(page & this->pagemask)) {
-                                chipnr++;
-                                this->select_chip(mtd, -1);
-                                this->select_chip(mtd, chipnr);
-                        }
-
-                        /* Apply delay or wait for ready/busy pin
-                         * Do this before the AUTOINCR check, so no problems
-                         * arise if a chip which does auto increment
-                         * is marked as NOAUTOINCR by the board driver.
-                         */
-                        if (!this->dev_ready)
-                                udelay (this->chip_delay);
-                        else
-                                nand_wait_ready(mtd);
+        if (!chip->ecc.prepad && !chip->ecc.postpad) {
+                pos = steps * (eccsize + chunk);
+                steps = 0;
+        } else
+                pos = eccsize + chunk;
 
-                        /* Check, if the chip supports auto page increment
-                         * or if we have hit a block boundary.
-                        */
-                        if (!NAND_CANAUTOINCR(this) || !(page & blockcheck)) {
-                                /* For subsequent page reads set offset to 0 */
-                                this->cmdfunc (mtd, NAND_CMD_READOOB, 0x0, page & this->pagemask);
+        chip->cmdfunc(mtd, NAND_CMD_SEQIN, pos, page);
+        for (i = 0; i < steps; i++) {
+                if (sndcmd) {
+                        if (mtd->writesize <= 512) {
+                                uint32_t fill = 0xFFFFFFFF;
+
+                                len = eccsize;
+                                while (len > 0) {
+                                        int num = min_t(int, len, 4);
+                                        chip->write_buf(mtd, (uint8_t *)&fill,
+                                                        num);
+                                        len -= num;
+                                }
+                        } else {
+                                pos = eccsize + i * (eccsize + chunk);
+                                chip->cmdfunc(mtd, NAND_CMD_RNDIN, pos, -1);
                         }
-                }
+                } else
+                        sndcmd = 1;
+                len = min_t(int, length, chunk);
+                chip->write_buf(mtd, bufpoi, len);
+                bufpoi += len;
+                length -= len;
         }
+        if (length > 0)
+                chip->write_buf(mtd, bufpoi, length);
 
-        /* Deselect and wake up anyone waiting on the device */
-        nand_release_device(mtd);
+        chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
+        status = chip->waitfunc(mtd, chip);
 
-        /* Return happy */
-        *retlen = len;
-        return 0;
+        return status & NAND_STATUS_FAIL ? -EIO : 0;
 }
 
 /**
- * nand_read_raw - [GENERIC] Read raw data including oob into buffer
+ * nand_do_read_oob - [Intern] NAND read out-of-band
  * @mtd:        MTD device structure
- * @buf:        temporary buffer
  * @from:       offset to read from
- * @len:        number of bytes to read
- * @ooblen:     number of oob data bytes to read
+ * @ops:        oob operations description structure
  *
- * Read raw data including oob into buffer
+ * NAND read out-of-band data from the spare area
  */
-int nand_read_raw (struct mtd_info *mtd, uint8_t *buf, loff_t from, size_t len, size_t ooblen)
+static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
+                            struct mtd_oob_ops *ops)
 {
-        struct nand_chip *this = mtd->priv;
-        int page = (int) (from >> this->page_shift);
-        int chip = (int) (from >> this->chip_shift);
-        int sndcmd = 1;
-        int cnt = 0;
-        int pagesize = mtd->oobblock + mtd->oobsize;
-        int     blockcheck = (1 << (this->phys_erase_shift - this->page_shift)) - 1;
+        int page, realpage, chipnr, sndcmd = 1;
+        struct nand_chip *chip = mtd->priv;
+        int blkcheck = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;
+        int readlen = ops->len;
+        uint8_t *buf = ops->oobbuf;
 
-        /* Do not allow reads past end of device */
-        if ((from + len) > mtd->size) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_read_raw: Attempt read beyond end of device\n");
-                return -EINVAL;
-        }
+        DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08Lx, len = %i\n",
+              (unsigned long long)from, readlen);
 
-        /* Grab the lock and see if the device is available */
-        nand_get_device (this, mtd , FL_READING);
+        chipnr = (int)(from >> chip->chip_shift);
+        chip->select_chip(mtd, chipnr);
 
-        this->select_chip (mtd, chip);
+        /* Shift to get page */
+        realpage = (int)(from >> chip->page_shift);
+        page = realpage & chip->pagemask;
 
-        /* Add requested oob length */
-        len += ooblen;
+        chip->oob_poi = chip->buffers.oobrbuf;
 
-        while (len) {
-                if (sndcmd)
-                        this->cmdfunc (mtd, NAND_CMD_READ0, 0, page & this->pagemask);
-                sndcmd = 0;
+        while(1) {
+                sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd);
+                buf = nand_transfer_oob(chip, buf, ops);
 
-                this->read_buf (mtd, &buf[cnt], pagesize);
+                readlen -= ops->ooblen;
+                if (!readlen)
+                        break;
 
-                len -= pagesize;
-                cnt += pagesize;
-                page++;
+                if (!(chip->options & NAND_NO_READRDY)) {
+                        /*
+                         * Apply delay or wait for ready/busy pin. Do this
+                         * before the AUTOINCR check, so no problems arise if a
+                         * chip which does auto increment is marked as
+                         * NOAUTOINCR by the board driver.
+                         */
+                        if (!chip->dev_ready)
+                                udelay(chip->chip_delay);
+                        else
+                                nand_wait_ready(mtd);
+                }
 
-                if (!this->dev_ready)
-                        udelay (this->chip_delay);
-                else
-                        nand_wait_ready(mtd);
+                /* Increment page address */
+                realpage++;
 
-                /* Check, if the chip supports auto page increment */
-                if (!NAND_CANAUTOINCR(this) || !(page & blockcheck))
+                page = realpage & chip->pagemask;
+                /* Check, if we cross a chip boundary */
+                if (!page) {
+                        chipnr++;
+                        chip->select_chip(mtd, -1);
+                        chip->select_chip(mtd, chipnr);
+                }
+
+                /* Check, if the chip supports auto page increment
+                 * or if we have hit a block boundary.
+                 */
+                if (!NAND_CANAUTOINCR(chip) || !(page & blkcheck))
                         sndcmd = 1;
         }
 
-        /* Deselect and wake up anyone waiting on the device */
-        nand_release_device(mtd);
+        ops->retlen = ops->len;
         return 0;
 }
 
-
 /**
- * nand_prepare_oobbuf - [GENERIC] Prepare the out of band buffer
+ * nand_read_oob - [MTD Interface] NAND read data and/or out-of-band
  * @mtd:        MTD device structure
- * @fsbuf:      buffer given by fs driver
- * @oobsel:     out of band selection structre
- * @autoplace:  1 = place given buffer into the oob bytes
- * @numpages:   number of pages to prepare
- *
- * Return:
- * 1. Filesystem buffer available and autoplacement is off,
- *    return filesystem buffer
- * 2. No filesystem buffer or autoplace is off, return internal
- *    buffer
- * 3. Filesystem buffer is given and autoplace selected
- *    put data from fs buffer into internal buffer and
- *    retrun internal buffer
- *
- * Note: The internal buffer is filled with 0xff. This must
- * be done only once, when no autoplacement happens
- * Autoplacement sets the buffer dirty flag, which
- * forces the 0xff fill before using the buffer again.
+ * @from:       offset to read from
+ * @ops:        oob operation description structure
  *
-*/
-static u_char * nand_prepare_oobbuf (struct mtd_info *mtd, u_char *fsbuf, struct nand_oobinfo *oobsel,
-                int autoplace, int numpages)
+ * NAND read data and/or out-of-band data
+ */
+static int nand_read_oob(struct mtd_info *mtd, loff_t from,
+                         struct mtd_oob_ops *ops)
 {
-        struct nand_chip *this = mtd->priv;
-        int i, len, ofs;
-
-        /* Zero copy fs supplied buffer */
-        if (fsbuf && !autoplace)
-                return fsbuf;
-
-        /* Check, if the buffer must be filled with ff again */
-        if (this->oobdirty) {
-                memset (this->oob_buf, 0xff,
-                        mtd->oobsize << (this->phys_erase_shift - this->page_shift));
-                this->oobdirty = 0;
+        int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip,
+                         uint8_t *buf) = NULL;
+        struct nand_chip *chip = mtd->priv;
+        int ret = -ENOTSUPP;
+
+        ops->retlen = 0;
+
+        /* Do not allow reads past end of device */
+        if ((from + ops->len) > mtd->size) {
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "
+                      "Attempt read beyond end of device\n");
+                return -EINVAL;
         }
 
-        /* If we have no autoplacement or no fs buffer use the internal one */
-        if (!autoplace || !fsbuf)
-                return this->oob_buf;
-
-        /* Walk through the pages and place the data */
-        this->oobdirty = 1;
-        ofs = 0;
-        while (numpages--) {
-                for (i = 0, len = 0; len < mtd->oobavail; i++) {
-                        int to = ofs + oobsel->oobfree[i][0];
-                        int num = oobsel->oobfree[i][1];
-                        memcpy (&this->oob_buf[to], fsbuf, num);
-                        len += num;
-                        fsbuf += num;
-                }
-                ofs += mtd->oobavail;
+        nand_get_device(chip, mtd, FL_READING);
+
+        switch(ops->mode) {
+        case MTD_OOB_PLACE:
+        case MTD_OOB_AUTO:
+                break;
+
+        case MTD_OOB_RAW:
+                /* Replace the read_page algorithm temporary */
+                read_page = chip->ecc.read_page;
+                chip->ecc.read_page = nand_read_page_raw;
+                break;
+
+        default:
+                goto out;
         }
-        return this->oob_buf;
+
+        if (!ops->datbuf)
+                ret = nand_do_read_oob(mtd, from, ops);
+        else
+                ret = nand_do_read_ops(mtd, from, ops);
+
+        if (unlikely(ops->mode == MTD_OOB_RAW))
+                chip->ecc.read_page = read_page;
+ out:
+        nand_release_device(mtd);
+        return ret;
 }
 
-#define NOTALIGNED(x) (x & (mtd->oobblock-1)) != 0
 
 /**
- * nand_write - [MTD Interface] compability function for nand_write_ecc
- * @mtd:        MTD device structure
- * @to:         offset to write to
- * @len:        number of bytes to write
- * @retlen:     pointer to variable to store the number of written bytes
- * @buf:        the data to write
- *
- * This function simply calls nand_write_ecc with oob buffer and oobsel = NULL
- *
-*/
-static int nand_write (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf)
+ * nand_write_page_raw - [Intern] raw page write function
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        data buffer
+ */
+static void nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
+                                const uint8_t *buf)
 {
-        return (nand_write_ecc (mtd, to, len, retlen, buf, NULL, NULL));
+        chip->write_buf(mtd, buf, mtd->writesize);
+        chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
 }
 
 /**
- * nand_write_ecc - [MTD Interface] NAND write with ECC
- * @mtd:        MTD device structure
- * @to:         offset to write to
- * @len:        number of bytes to write
- * @retlen:     pointer to variable to store the number of written bytes
- * @buf:        the data to write
- * @eccbuf:     filesystem supplied oob data buffer
- * @oobsel:     oob selection structure
- *
- * NAND write with ECC
+ * nand_write_page_swecc - {REPLACABLE] software ecc based page write function
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        data buffer
  */
-static int nand_write_ecc (struct mtd_info *mtd, loff_t to, size_t len,
-                           size_t * retlen, const u_char * buf, u_char * eccbuf, struct nand_oobinfo *oobsel)
+static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
+                                  const uint8_t *buf)
 {
-        int startpage, page, ret = -EIO, oob = 0, written = 0, chipnr;
-        int autoplace = 0, numpages, totalpages;
-        struct nand_chip *this = mtd->priv;
-        u_char *oobbuf, *bufstart;
-        int     ppblock = (1 << (this->phys_erase_shift - this->page_shift));
+        int i, eccsize = chip->ecc.size;
+        int eccbytes = chip->ecc.bytes;
+        int eccsteps = chip->ecc.steps;
+        uint8_t *ecc_calc = chip->buffers.ecccalc;
+        const uint8_t *p = buf;
+        int *eccpos = chip->ecc.layout->eccpos;
 
-        DEBUG (MTD_DEBUG_LEVEL3, "nand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+        /* Software ecc calculation */
+        for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
+                chip->ecc.calculate(mtd, p, &ecc_calc[i]);
 
-        /* Initialize retlen, in case of early exit */
-        *retlen = 0;
+        for (i = 0; i < chip->ecc.total; i++)
+                chip->oob_poi[eccpos[i]] = ecc_calc[i];
 
-        /* Do not allow write past end of device */
-        if ((to + len) > mtd->size) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: Attempt to write past end of page\n");
-                return -EINVAL;
-        }
+        nand_write_page_raw(mtd, chip, buf);
+}
 
-        /* reject writes, which are not page aligned */
-        if (NOTALIGNED (to) || NOTALIGNED(len)) {
-                printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");
-                return -EINVAL;
+/**
+ * nand_write_page_hwecc - {REPLACABLE] hardware ecc based page write function
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        data buffer
+ */
+static void nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
+                                  const uint8_t *buf)
+{
+        int i, eccsize = chip->ecc.size;
+        int eccbytes = chip->ecc.bytes;
+        int eccsteps = chip->ecc.steps;
+        uint8_t *ecc_calc = chip->buffers.ecccalc;
+        const uint8_t *p = buf;
+        int *eccpos = chip->ecc.layout->eccpos;
+
+        for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
+                chip->ecc.hwctl(mtd, NAND_ECC_WRITE);
+                chip->write_buf(mtd, p, eccsize);
+                chip->ecc.calculate(mtd, p, &ecc_calc[i]);
         }
 
-        /* Grab the lock and see if the device is available */
-        nand_get_device (this, mtd, FL_WRITING);
+        for (i = 0; i < chip->ecc.total; i++)
+                chip->oob_poi[eccpos[i]] = ecc_calc[i];
 
-        /* Calculate chipnr */
-        chipnr = (int)(to >> this->chip_shift);
-        /* Select the NAND device */
-        this->select_chip(mtd, chipnr);
+        chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
+}
 
-        /* Check, if it is write protected */
-        if (nand_check_wp(mtd))
-                goto out;
+/**
+ * nand_write_page_syndrome - {REPLACABLE] hardware ecc syndrom based page write
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        data buffer
+ *
+ * The hw generator calculates the error syndrome automatically. Therefor
+ * we need a special oob layout and handling.
+ */
+static void nand_write_page_syndrome(struct mtd_info *mtd,
+                                    struct nand_chip *chip, const uint8_t *buf)
+{
+        int i, eccsize = chip->ecc.size;
+        int eccbytes = chip->ecc.bytes;
+        int eccsteps = chip->ecc.steps;
+        const uint8_t *p = buf;
+        uint8_t *oob = chip->oob_poi;
 
-        /* if oobsel is NULL, use chip defaults */
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
+        for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
 
-        /* Autoplace of oob data ? Use the default placement scheme */
-        if (oobsel->useecc == MTD_NANDECC_AUTOPLACE) {
-                oobsel = this->autooob;
-                autoplace = 1;
-        }
-        if (oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
-                autoplace = 1;
+                chip->ecc.hwctl(mtd, NAND_ECC_WRITE);
+                chip->write_buf(mtd, p, eccsize);
 
-        /* Setup variables and oob buffer */
-        totalpages = len >> this->page_shift;
-        page = (int) (to >> this->page_shift);
-        /* Invalidate the page cache, if we write to the cached page */
-        if (page <= this->pagebuf && this->pagebuf < (page + totalpages))
-                this->pagebuf = -1;
-
-        /* Set it relative to chip */
-        page &= this->pagemask;
-        startpage = page;
-        /* Calc number of pages we can write in one go */
-        numpages = min (ppblock - (startpage  & (ppblock - 1)), totalpages);
-        oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel, autoplace, numpages);
-        bufstart = (u_char *)buf;
-
-        /* Loop until all data is written */
-        while (written < len) {
-
-                this->data_poi = (u_char*) &buf[written];
-                /* Write one page. If this is the last page to write
-                 * or the last page in this block, then use the
-                 * real pageprogram command, else select cached programming
-                 * if supported by the chip.
-                 */
-                ret = nand_write_page (mtd, this, page, &oobbuf[oob], oobsel, (--numpages > 0));
-                if (ret) {
-                        DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: write_page failed %d\n", ret);
-                        goto out;
+                if (chip->ecc.prepad) {
+                        chip->write_buf(mtd, oob, chip->ecc.prepad);
+                        oob += chip->ecc.prepad;
                 }
-                /* Next oob page */
-                oob += mtd->oobsize;
-                /* Update written bytes count */
-                written += mtd->oobblock;
-                if (written == len)
-                        goto cmp;
 
-                /* Increment page address */
-                page++;
-
-                /* Have we hit a block boundary ? Then we have to verify and
-                 * if verify is ok, we have to setup the oob buffer for
-                 * the next pages.
-                */
-                if (!(page & (ppblock - 1))){
-                        int ofs;
-                        this->data_poi = bufstart;
-                        ret = nand_verify_pages (mtd, this, startpage,
-                                page - startpage,
-                                oobbuf, oobsel, chipnr, (eccbuf != NULL));
-                        if (ret) {
-                                DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
-                                goto out;
-                        }
-                        *retlen = written;
-
-                        ofs = autoplace ? mtd->oobavail : mtd->oobsize;
-                        if (eccbuf)
-                                eccbuf += (page - startpage) * ofs;
-                        totalpages -= page - startpage;
-                        numpages = min (totalpages, ppblock);
-                        page &= this->pagemask;
-                        startpage = page;
-                        oobbuf = nand_prepare_oobbuf (mtd, eccbuf, oobsel,
-                                        autoplace, numpages);
-                        oob = 0;
-                        /* Check, if we cross a chip boundary */
-                        if (!page) {
-                                chipnr++;
-                                this->select_chip(mtd, -1);
-                                this->select_chip(mtd, chipnr);
-                        }
+                chip->ecc.calculate(mtd, p, oob);
+                chip->write_buf(mtd, oob, eccbytes);
+                oob += eccbytes;
+
+                if (chip->ecc.postpad) {
+                        chip->write_buf(mtd, oob, chip->ecc.postpad);
+                        oob += chip->ecc.postpad;
                 }
         }
-        /* Verify the remaining pages */
-cmp:
-        this->data_poi = bufstart;
-        ret = nand_verify_pages (mtd, this, startpage, totalpages,
-                oobbuf, oobsel, chipnr, (eccbuf != NULL));
-        if (!ret)
-                *retlen = written;
-        else
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_write_ecc: verify_pages failed %d\n", ret);
 
-out:
-        /* Deselect and wake up anyone waiting on the device */
-        nand_release_device(mtd);
-
-        return ret;
+        /* Calculate remaining oob bytes */
+        i = mtd->oobsize - (oob - chip->oob_poi);
+        if (i)
+                chip->write_buf(mtd, oob, i);
 }
 
-
 /**
- * nand_write_oob - [MTD Interface] NAND write out-of-band
+ * nand_write_page - [INTERNAL] write one page
  * @mtd:        MTD device structure
- * @to:         offset to write to
- * @len:        number of bytes to write
- * @retlen:     pointer to variable to store the number of written bytes
+ * @chip:       NAND chip descriptor
  * @buf:        the data to write
- *
- * NAND write out-of-band
+ * @page:       page number to write
+ * @cached:     cached programming
  */
-static int nand_write_oob (struct mtd_info *mtd, loff_t to, size_t len, size_t * retlen, const u_char * buf)
+static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+                           const uint8_t *buf, int page, int cached)
 {
-        int column, page, status, ret = -EIO, chipnr;
-        struct nand_chip *this = mtd->priv;
+        int status;
 
-        DEBUG (MTD_DEBUG_LEVEL3, "nand_write_oob: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+        chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page);
 
-        /* Shift to get page */
-        page = (int) (to >> this->page_shift);
-        chipnr = (int) (to >> this->chip_shift);
+        chip->ecc.write_page(mtd, chip, buf);
 
-        /* Mask to get column */
-        column = to & (mtd->oobsize - 1);
+        /*
+         * Cached progamming disabled for now, Not sure if its worth the
+         * trouble. The speed gain is not very impressive. (2.3->2.6Mib/s)
+         */
+        cached = 0;
 
-        /* Initialize return length value */
-        *retlen = 0;
+        if (!cached || !(chip->options & NAND_CACHEPRG)) {
 
-        /* Do not allow write past end of page */
-        if ((column + len) > mtd->oobsize) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: Attempt to write past end of page\n");
-                return -EINVAL;
+                chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
+                status = chip->waitfunc(mtd, chip);
+                /*
+                 * See if operation failed and additional status checks are
+                 * available
+                 */
+                if ((status & NAND_STATUS_FAIL) && (chip->errstat))
+                        status = chip->errstat(mtd, chip, FL_WRITING, status,
+                                               page);
+
+                if (status & NAND_STATUS_FAIL)
+                        return -EIO;
+        } else {
+                chip->cmdfunc(mtd, NAND_CMD_CACHEDPROG, -1, -1);
+                status = chip->waitfunc(mtd, chip);
         }
 
-        /* Grab the lock and see if the device is available */
-        nand_get_device (this, mtd, FL_WRITING);
+#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
+        /* Send command to read back the data */
+        chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page);
 
-        /* Select the NAND device */
-        this->select_chip(mtd, chipnr);
+        if (chip->verify_buf(mtd, buf, mtd->writesize))
+                return -EIO;
+#endif
+        return 0;
+}
+
+/**
+ * nand_fill_oob - [Internal] Transfer client buffer to oob
+ * @chip:       nand chip structure
+ * @oob:        oob data buffer
+ * @ops:        oob ops structure
+ */
+static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob,
+                                  struct mtd_oob_ops *ops)
+{
+        size_t len = ops->ooblen;
+
+        switch(ops->mode) {
+
+        case MTD_OOB_PLACE:
+        case MTD_OOB_RAW:
+                memcpy(chip->oob_poi + ops->ooboffs, oob, len);
+                return oob + len;
+
+        case MTD_OOB_AUTO: {
+                struct nand_oobfree *free = chip->ecc.layout->oobfree;
+                uint32_t boffs = 0, woffs = ops->ooboffs;
+                size_t bytes = 0;
+
+                for(; free->length && len; free++, len -= bytes) {
+                        /* Write request not from offset 0 ? */
+                        if (unlikely(woffs)) {
+                                if (woffs >= free->length) {
+                                        woffs -= free->length;
+                                        continue;
+                                }
+                                boffs = free->offset + woffs;
+                                bytes = min_t(size_t, len,
+                                              (free->length - woffs));
+                                woffs = 0;
+                        } else {
+                                bytes = min_t(size_t, len, free->length);
+                                boffs = free->offset;
+                        }
+                        memcpy(chip->oob_poi + woffs, oob, bytes);
+                        oob += bytes;
+                }
+                return oob;
+        }
+        default:
+                BUG();
+        }
+        return NULL;
+}
+
+#define NOTALIGNED(x) (x & (mtd->writesize-1)) != 0
+
+/**
+ * nand_do_write_ops - [Internal] NAND write with ECC
+ * @mtd:        MTD device structure
+ * @to:         offset to write to
+ * @ops:        oob operations description structure
+ *
+ * NAND write with ECC
+ */
+static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
+                             struct mtd_oob_ops *ops)
+{
+        int chipnr, realpage, page, blockmask;
+        struct nand_chip *chip = mtd->priv;
+        uint32_t writelen = ops->len;
+        uint8_t *oob = ops->oobbuf;
+        uint8_t *buf = ops->datbuf;
+        int bytes = mtd->writesize;
+        int ret;
 
-        /* Reset the chip. Some chips (like the Toshiba TC5832DC found
-           in one of my DiskOnChip 2000 test units) will clear the whole
-           data page too if we don't do this. I have no clue why, but
-           I seem to have 'fixed' it in the doc2000 driver in
-           August 1999.  dwmw2. */
-        this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
+        ops->retlen = 0;
+
+        /* reject writes, which are not page aligned */
+        if (NOTALIGNED(to) || NOTALIGNED(ops->len)) {
+                printk(KERN_NOTICE "nand_write: "
+                       "Attempt to write not page aligned data\n");
+                return -EINVAL;
+        }
+
+        if (!writelen)
+                return 0;
 
         /* Check, if it is write protected */
         if (nand_check_wp(mtd))
-                goto out;
+                return -EIO;
 
-        /* Invalidate the page cache, if we write to the cached page */
-        if (page == this->pagebuf)
-                this->pagebuf = -1;
-
-        if (NAND_MUST_PAD(this)) {
-                /* Write out desired data */
-                this->cmdfunc (mtd, NAND_CMD_SEQIN, mtd->oobblock, page & this->pagemask);
-                /* prepad 0xff for partial programming */
-                this->write_buf(mtd, ffchars, column);
-                /* write data */
-                this->write_buf(mtd, buf, len);
-                /* postpad 0xff for partial programming */
-                this->write_buf(mtd, ffchars, mtd->oobsize - (len+column));
-        } else {
-                /* Write out desired data */
-                this->cmdfunc (mtd, NAND_CMD_SEQIN, mtd->oobblock + column, page & this->pagemask);
-                /* write data */
-                this->write_buf(mtd, buf, len);
-        }
-        /* Send command to program the OOB data */
-        this->cmdfunc (mtd, NAND_CMD_PAGEPROG, -1, -1);
+        chipnr = (int)(to >> chip->chip_shift);
+        chip->select_chip(mtd, chipnr);
 
-        status = this->waitfunc (mtd, this, FL_WRITING);
+        realpage = (int)(to >> chip->page_shift);
+        page = realpage & chip->pagemask;
+        blockmask = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;
 
-        /* See if device thinks it succeeded */
-        if (status & NAND_STATUS_FAIL) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: " "Failed write, page 0x%08x\n", page);
-                ret = -EIO;
-                goto out;
-        }
-        /* Return happy */
-        *retlen = len;
+        /* Invalidate the page cache, when we write to the cached page */
+        if (to <= (chip->pagebuf << chip->page_shift) &&
+            (chip->pagebuf << chip->page_shift) < (to + ops->len))
+                chip->pagebuf = -1;
 
-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-        /* Send command to read back the data */
-        this->cmdfunc (mtd, NAND_CMD_READOOB, column, page & this->pagemask);
+        chip->oob_poi = chip->buffers.oobwbuf;
 
-        if (this->verify_buf(mtd, buf, len)) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_write_oob: " "Failed write verify, page 0x%08x\n", page);
-                ret = -EIO;
-                goto out;
+        while(1) {
+                int cached = writelen > bytes && page != blockmask;
+
+                if (unlikely(oob))
+                        oob = nand_fill_oob(chip, oob, ops);
+
+                ret = nand_write_page(mtd, chip, buf, page, cached);
+                if (ret)
+                        break;
+
+                writelen -= bytes;
+                if (!writelen)
+                        break;
+
+                buf += bytes;
+                realpage++;
+
+                page = realpage & chip->pagemask;
+                /* Check, if we cross a chip boundary */
+                if (!page) {
+                        chipnr++;
+                        chip->select_chip(mtd, -1);
+                        chip->select_chip(mtd, chipnr);
+                }
         }
-#endif
-        ret = 0;
-out:
-        /* Deselect and wake up anyone waiting on the device */
-        nand_release_device(mtd);
 
+        if (unlikely(oob))
+                memset(chip->oob_poi, 0xff, mtd->oobsize);
+
+        ops->retlen = ops->len - writelen;
         return ret;
 }
 
-
 /**
- * nand_writev - [MTD Interface] compabilty function for nand_writev_ecc
+ * nand_write - [MTD Interface] NAND write with ECC
  * @mtd:        MTD device structure
- * @vecs:       the iovectors to write
- * @count:      number of vectors
  * @to:         offset to write to
+ * @len:        number of bytes to write
  * @retlen:     pointer to variable to store the number of written bytes
+ * @buf:        the data to write
  *
- * NAND write with kvec. This just calls the ecc function
+ * NAND write with ECC
  */
-static int nand_writev (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count,
-                loff_t to, size_t * retlen)
+static int nand_write(struct mtd_info *mtd, loff_t to, size_t len,
+                          size_t *retlen, const uint8_t *buf)
 {
-        return (nand_writev_ecc (mtd, vecs, count, to, retlen, NULL, NULL));
+        struct nand_chip *chip = mtd->priv;
+        int ret;
+
+        /* Do not allow reads past end of device */
+        if ((to + len) > mtd->size)
+                return -EINVAL;
+        if (!len)
+                return 0;
+
+        nand_get_device(chip, mtd, FL_WRITING);
+
+        chip->ops.len = len;
+        chip->ops.datbuf = (uint8_t *)buf;
+        chip->ops.oobbuf = NULL;
+
+        ret = nand_do_write_ops(mtd, to, &chip->ops);
+
+        nand_release_device(mtd);
+
+        *retlen = chip->ops.retlen;
+        return ret;
 }
 
 /**
- * nand_writev_ecc - [MTD Interface] write with iovec with ecc
+ * nand_do_write_oob - [MTD Interface] NAND write out-of-band
  * @mtd:        MTD device structure
- * @vecs:       the iovectors to write
- * @count:      number of vectors
  * @to:         offset to write to
- * @retlen:     pointer to variable to store the number of written bytes
- * @eccbuf:     filesystem supplied oob data buffer
- * @oobsel:     oob selection structure
+ * @ops:        oob operation description structure
  *
- * NAND write with iovec with ecc
+ * NAND write out-of-band
  */
-static int nand_writev_ecc (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count,
-                loff_t to, size_t * retlen, u_char *eccbuf, struct nand_oobinfo *oobsel)
+static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
+                             struct mtd_oob_ops *ops)
 {
-        int i, page, len, total_len, ret = -EIO, written = 0, chipnr;
-        int oob, numpages, autoplace = 0, startpage;
-        struct nand_chip *this = mtd->priv;
-        int     ppblock = (1 << (this->phys_erase_shift - this->page_shift));
-        u_char *oobbuf, *bufstart;
-
-        /* Preset written len for early exit */
-        *retlen = 0;
-
-        /* Calculate total length of data */
-        total_len = 0;
-        for (i = 0; i < count; i++)
-                total_len += (int) vecs[i].iov_len;
+        int chipnr, page, status;
+        struct nand_chip *chip = mtd->priv;
 
-        DEBUG (MTD_DEBUG_LEVEL3,
-               "nand_writev: to = 0x%08x, len = %i, count = %ld\n", (unsigned int) to, (unsigned int) total_len, count);
+        DEBUG(MTD_DEBUG_LEVEL3, "nand_write_oob: to = 0x%08x, len = %i\n",
+              (unsigned int)to, (int)ops->len);
 
         /* Do not allow write past end of page */
-        if ((to + total_len) > mtd->size) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_writev: Attempted write past end of device\n");
+        if ((ops->ooboffs + ops->len) > mtd->oobsize) {
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_write_oob: "
+                      "Attempt to write past end of page\n");
                 return -EINVAL;
         }
 
-        /* reject writes, which are not page aligned */
-        if (NOTALIGNED (to) || NOTALIGNED(total_len)) {
-                printk (KERN_NOTICE "nand_write_ecc: Attempt to write not page aligned data\n");
-                return -EINVAL;
-        }
+        chipnr = (int)(to >> chip->chip_shift);
+        chip->select_chip(mtd, chipnr);
 
-        /* Grab the lock and see if the device is available */
-        nand_get_device (this, mtd, FL_WRITING);
+        /* Shift to get page */
+        page = (int)(to >> chip->page_shift);
 
-        /* Get the current chip-nr */
-        chipnr = (int) (to >> this->chip_shift);
-        /* Select the NAND device */
-        this->select_chip(mtd, chipnr);
+        /*
+         * Reset the chip. Some chips (like the Toshiba TC5832DC found in one
+         * of my DiskOnChip 2000 test units) will clear the whole data page too
+         * if we don't do this. I have no clue why, but I seem to have 'fixed'
+         * it in the doc2000 driver in August 1999.  dwmw2.
+         */
+        chip->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
 
         /* Check, if it is write protected */
         if (nand_check_wp(mtd))
-                goto out;
+                return -EROFS;
 
-        /* if oobsel is NULL, use chip defaults */
-        if (oobsel == NULL)
-                oobsel = &mtd->oobinfo;
+        /* Invalidate the page cache, if we write to the cached page */
+        if (page == chip->pagebuf)
+                chip->pagebuf = -1;
 
-        /* Autoplace of oob data ? Use the default placement scheme */
-        if (oobsel->useecc == MTD_NANDECC_AUTOPLACE) {
-                oobsel = this->autooob;
-                autoplace = 1;
-        }
-        if (oobsel->useecc == MTD_NANDECC_AUTOPL_USR)
-                autoplace = 1;
+        chip->oob_poi = chip->buffers.oobwbuf;
+        memset(chip->oob_poi, 0xff, mtd->oobsize);
+        nand_fill_oob(chip, ops->oobbuf, ops);
+        status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask);
+        memset(chip->oob_poi, 0xff, mtd->oobsize);
 
-        /* Setup start page */
-        page = (int) (to >> this->page_shift);
-        /* Invalidate the page cache, if we write to the cached page */
-        if (page <= this->pagebuf && this->pagebuf < ((to + total_len) >> this->page_shift))
-                this->pagebuf = -1;
+        if (status)
+                return status;
 
-        startpage = page & this->pagemask;
+        ops->retlen = ops->len;
 
-        /* Loop until all kvec' data has been written */
-        len = 0;
-        while (count) {
-                /* If the given tuple is >= pagesize then
-                 * write it out from the iov
-                 */
-                if ((vecs->iov_len - len) >= mtd->oobblock) {
-                        /* Calc number of pages we can write
-                         * out of this iov in one go */
-                        numpages = (vecs->iov_len - len) >> this->page_shift;
-                        /* Do not cross block boundaries */
-                        numpages = min (ppblock - (startpage & (ppblock - 1)), numpages);
-                        oobbuf = nand_prepare_oobbuf (mtd, NULL, oobsel, autoplace, numpages);
-                        bufstart = (u_char *)vecs->iov_base;
-                        bufstart += len;
-                        this->data_poi = bufstart;
-                        oob = 0;
-                        for (i = 1; i <= numpages; i++) {
-                                /* Write one page. If this is the last page to write
-                                 * then use the real pageprogram command, else select
-                                 * cached programming if supported by the chip.
-                                 */
-                                ret = nand_write_page (mtd, this, page & this->pagemask,
-                                        &oobbuf[oob], oobsel, i != numpages);
-                                if (ret)
-                                        goto out;
-                                this->data_poi += mtd->oobblock;
-                                len += mtd->oobblock;
-                                oob += mtd->oobsize;
-                                page++;
-                        }
-                        /* Check, if we have to switch to the next tuple */
-                        if (len >= (int) vecs->iov_len) {
-                                vecs++;
-                                len = 0;
-                                count--;
-                        }
-                } else {
-                        /* We must use the internal buffer, read data out of each
-                         * tuple until we have a full page to write
-                         */
-                        int cnt = 0;
-                        while (cnt < mtd->oobblock) {
-                                if (vecs->iov_base != NULL && vecs->iov_len)
-                                        this->data_buf[cnt++] = ((u_char *) vecs->iov_base)[len++];
-                                /* Check, if we have to switch to the next tuple */
-                                if (len >= (int) vecs->iov_len) {
-                                        vecs++;
-                                        len = 0;
-                                        count--;
-                                }
-                        }
-                        this->pagebuf = page;
-                        this->data_poi = this->data_buf;
-                        bufstart = this->data_poi;
-                        numpages = 1;
-                        oobbuf = nand_prepare_oobbuf (mtd, NULL, oobsel, autoplace, numpages);
-                        ret = nand_write_page (mtd, this, page & this->pagemask,
-                                oobbuf, oobsel, 0);
-                        if (ret)
-                                goto out;
-                        page++;
-                }
+        return 0;
+}
 
-                this->data_poi = bufstart;
-                ret = nand_verify_pages (mtd, this, startpage, numpages, oobbuf, oobsel, chipnr, 0);
-                if (ret)
-                        goto out;
+/**
+ * nand_write_oob - [MTD Interface] NAND write data and/or out-of-band
+ * @mtd:        MTD device structure
+ * @from:       offset to read from
+ * @ops:        oob operation description structure
+ */
+static int nand_write_oob(struct mtd_info *mtd, loff_t to,
+                          struct mtd_oob_ops *ops)
+{
+        void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip,
+                          const uint8_t *buf) = NULL;
+        struct nand_chip *chip = mtd->priv;
+        int ret = -ENOTSUPP;
 
-                written += mtd->oobblock * numpages;
-                /* All done ? */
-                if (!count)
-                        break;
+        ops->retlen = 0;
 
-                startpage = page & this->pagemask;
-                /* Check, if we cross a chip boundary */
-                if (!startpage) {
-                        chipnr++;
-                        this->select_chip(mtd, -1);
-                        this->select_chip(mtd, chipnr);
-                }
+        /* Do not allow writes past end of device */
+        if ((to + ops->len) > mtd->size) {
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "
+                      "Attempt read beyond end of device\n");
+                return -EINVAL;
         }
-        ret = 0;
-out:
-        /* Deselect and wake up anyone waiting on the device */
-        nand_release_device(mtd);
 
-        *retlen = written;
+        nand_get_device(chip, mtd, FL_WRITING);
+
+        switch(ops->mode) {
+        case MTD_OOB_PLACE:
+        case MTD_OOB_AUTO:
+                break;
+
+        case MTD_OOB_RAW:
+                /* Replace the write_page algorithm temporary */
+                write_page = chip->ecc.write_page;
+                chip->ecc.write_page = nand_write_page_raw;
+                break;
+
+        default:
+                goto out;
+        }
+
+        if (!ops->datbuf)
+                ret = nand_do_write_oob(mtd, to, ops);
+        else
+                ret = nand_do_write_ops(mtd, to, ops);
+
+        if (unlikely(ops->mode == MTD_OOB_RAW))
+                chip->ecc.write_page = write_page;
+ out:
+        nand_release_device(mtd);
         return ret;
 }
 
@@ -2050,12 +1816,12 @@ out:
  *
  * Standard erase command for NAND chips
  */
-static void single_erase_cmd (struct mtd_info *mtd, int page)
+static void single_erase_cmd(struct mtd_info *mtd, int page)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         /* Send commands to erase a block */
-        this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page);
-        this->cmdfunc (mtd, NAND_CMD_ERASE2, -1, -1);
+        chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);
+        chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);
 }
 
 /**
@@ -2066,15 +1832,15 @@ static void single_erase_cmd (struct mtd_info *mtd, int page)
  * AND multi block erase command function
  * Erase 4 consecutive blocks
  */
-static void multi_erase_cmd (struct mtd_info *mtd, int page)
+static void multi_erase_cmd(struct mtd_info *mtd, int page)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         /* Send commands to erase a block */
-        this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);
-        this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);
-        this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page++);
-        this->cmdfunc (mtd, NAND_CMD_ERASE1, -1, page);
-        this->cmdfunc (mtd, NAND_CMD_ERASE2, -1, -1);
+        chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page++);
+        chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page++);
+        chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page++);
+        chip->cmdfunc(mtd, NAND_CMD_ERASE1, -1, page);
+        chip->cmdfunc(mtd, NAND_CMD_ERASE2, -1, -1);
 }
 
 /**
@@ -2084,79 +1850,82 @@ static void multi_erase_cmd (struct mtd_info *mtd, int page)
  *
  * Erase one ore more blocks
  */
-static int nand_erase (struct mtd_info *mtd, struct erase_info *instr)
+static int nand_erase(struct mtd_info *mtd, struct erase_info *instr)
 {
-        return nand_erase_nand (mtd, instr, 0);
+        return nand_erase_nand(mtd, instr, 0);
 }
 
 #define BBT_PAGE_MASK   0xffffff3f
 /**
- * nand_erase_intern - [NAND Interface] erase block(s)
+ * nand_erase_nand - [Internal] erase block(s)
  * @mtd:        MTD device structure
  * @instr:      erase instruction
  * @allowbbt:   allow erasing the bbt area
  *
  * Erase one ore more blocks
  */
-int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbbt)
+int nand_erase_nand(struct mtd_info *mtd, struct erase_info *instr,
+                    int allowbbt)
 {
         int page, len, status, pages_per_block, ret, chipnr;
-        struct nand_chip *this = mtd->priv;
-        int rewrite_bbt[NAND_MAX_CHIPS]={0};    /* flags to indicate the page, if bbt needs to be rewritten. */
-        unsigned int bbt_masked_page;           /* bbt mask to compare to page being erased. */
-                                                /* It is used to see if the current page is in the same */
-                                                /*   256 block group and the same bank as the bbt. */
+        struct nand_chip *chip = mtd->priv;
+        int rewrite_bbt[NAND_MAX_CHIPS]={0};
+        unsigned int bbt_masked_page = 0xffffffff;
 
-        DEBUG (MTD_DEBUG_LEVEL3,
-               "nand_erase: start = 0x%08x, len = %i\n", (unsigned int) instr->addr, (unsigned int) instr->len);
+        DEBUG(MTD_DEBUG_LEVEL3, "nand_erase: start = 0x%08x, len = %i\n",
+              (unsigned int)instr->addr, (unsigned int)instr->len);
 
         /* Start address must align on block boundary */
-        if (instr->addr & ((1 << this->phys_erase_shift) - 1)) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Unaligned address\n");
+        if (instr->addr & ((1 << chip->phys_erase_shift) - 1)) {
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: Unaligned address\n");
                 return -EINVAL;
         }
 
         /* Length must align on block boundary */
-        if (instr->len & ((1 << this->phys_erase_shift) - 1)) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Length not block aligned\n");
+        if (instr->len & ((1 << chip->phys_erase_shift) - 1)) {
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
+                      "Length not block aligned\n");
                 return -EINVAL;
         }
 
         /* Do not allow erase past end of device */
         if ((instr->len + instr->addr) > mtd->size) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Erase past end of device\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
+                      "Erase past end of device\n");
                 return -EINVAL;
         }
 
         instr->fail_addr = 0xffffffff;
 
         /* Grab the lock and see if the device is available */
-        nand_get_device (this, mtd, FL_ERASING);
+        nand_get_device(chip, mtd, FL_ERASING);
 
         /* Shift to get first page */
-        page = (int) (instr->addr >> this->page_shift);
-        chipnr = (int) (instr->addr >> this->chip_shift);
+        page = (int)(instr->addr >> chip->page_shift);
+        chipnr = (int)(instr->addr >> chip->chip_shift);
 
         /* Calculate pages in each block */
-        pages_per_block = 1 << (this->phys_erase_shift - this->page_shift);
+        pages_per_block = 1 << (chip->phys_erase_shift - chip->page_shift);
 
         /* Select the NAND device */
-        this->select_chip(mtd, chipnr);
+        chip->select_chip(mtd, chipnr);
 
-        /* Check the WP bit */
         /* Check, if it is write protected */
         if (nand_check_wp(mtd)) {
-                DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: Device is write protected!!!\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
+                      "Device is write protected!!!\n");
                 instr->state = MTD_ERASE_FAILED;
                 goto erase_exit;
         }
 
-        /* if BBT requires refresh, set the BBT page mask to see if the BBT should be rewritten */
-        if (this->options & BBT_AUTO_REFRESH) {
-                bbt_masked_page = this->bbt_td->pages[chipnr] & BBT_PAGE_MASK;
-        } else {
-                bbt_masked_page = 0xffffffff;   /* should not match anything */
-        }
+        /*
+         * If BBT requires refresh, set the BBT page mask to see if the BBT
+         * should be rewritten. Otherwise the mask is set to 0xffffffff which
+         * can not be matched. This is also done when the bbt is actually
+         * erased to avoid recusrsive updates
+         */
+        if (chip->options & BBT_AUTO_REFRESH && !allowbbt)
+                bbt_masked_page = chip->bbt_td->pages[chipnr] & BBT_PAGE_MASK;
 
         /* Loop through the pages */
         len = instr->len;
@@ -2164,64 +1933,77 @@ int nand_erase_nand (struct mtd_info *mtd, struct erase_info *instr, int allowbb
         instr->state = MTD_ERASING;
 
         while (len) {
-                /* Check if we have a bad block, we do not erase bad blocks ! */
-                if (nand_block_checkbad(mtd, ((loff_t) page) << this->page_shift, 0, allowbbt)) {
-                        printk (KERN_WARNING "nand_erase: attempt to erase a bad block at page 0x%08x\n", page);
+                /*
+                 * heck if we have a bad block, we do not erase bad blocks !
+                 */
+                if (nand_block_checkbad(mtd, ((loff_t) page) <<
+                                        chip->page_shift, 0, allowbbt)) {
+                        printk(KERN_WARNING "nand_erase: attempt to erase a "
+                               "bad block at page 0x%08x\n", page);
                         instr->state = MTD_ERASE_FAILED;
                         goto erase_exit;
                 }
 
-                /* Invalidate the page cache, if we erase the block which contains
-                   the current cached page */
-                if (page <= this->pagebuf && this->pagebuf < (page + pages_per_block))
-                        this->pagebuf = -1;
+                /*
+                 * Invalidate the page cache, if we erase the block which
+                 * contains the current cached page
+                 */
+                if (page <= chip->pagebuf && chip->pagebuf <
+                    (page + pages_per_block))
+                        chip->pagebuf = -1;
 
-                this->erase_cmd (mtd, page & this->pagemask);
+                chip->erase_cmd(mtd, page & chip->pagemask);
 
-                status = this->waitfunc (mtd, this, FL_ERASING);
+                status = chip->waitfunc(mtd, chip);
 
-                /* See if operation failed and additional status checks are available */
-                if ((status & NAND_STATUS_FAIL) && (this->errstat)) {
-                        status = this->errstat(mtd, this, FL_ERASING, status, page);
-                }
+                /*
+                 * See if operation failed and additional status checks are
+                 * available
+                 */
+                if ((status & NAND_STATUS_FAIL) && (chip->errstat))
+                        status = chip->errstat(mtd, chip, FL_ERASING,
+                                               status, page);
 
                 /* See if block erase succeeded */
                 if (status & NAND_STATUS_FAIL) {
-                        DEBUG (MTD_DEBUG_LEVEL0, "nand_erase: " "Failed erase, page 0x%08x\n", page);
+                        DEBUG(MTD_DEBUG_LEVEL0, "nand_erase: "
+                              "Failed erase, page 0x%08x\n", page);
                         instr->state = MTD_ERASE_FAILED;
-                        instr->fail_addr = (page << this->page_shift);
+                        instr->fail_addr = (page << chip->page_shift);
                         goto erase_exit;
                 }
 
-                /* if BBT requires refresh, set the BBT rewrite flag to the page being erased */
-                if (this->options & BBT_AUTO_REFRESH) {
-                        if (((page & BBT_PAGE_MASK) == bbt_masked_page) &&
-                             (page != this->bbt_td->pages[chipnr])) {
-                                rewrite_bbt[chipnr] = (page << this->page_shift);
-                        }
-                }
+                /*
+                 * If BBT requires refresh, set the BBT rewrite flag to the
+                 * page being erased
+                 */
+                if (bbt_masked_page != 0xffffffff &&
+                    (page & BBT_PAGE_MASK) == bbt_masked_page)
+                            rewrite_bbt[chipnr] = (page << chip->page_shift);
 
                 /* Increment page address and decrement length */
-                len -= (1 << this->phys_erase_shift);
+                len -= (1 << chip->phys_erase_shift);
                 page += pages_per_block;
 
                 /* Check, if we cross a chip boundary */
-                if (len && !(page & this->pagemask)) {
+                if (len && !(page & chip->pagemask)) {
                         chipnr++;
-                        this->select_chip(mtd, -1);
-                        this->select_chip(mtd, chipnr);
-
-                        /* if BBT requires refresh and BBT-PERCHIP,
-                         *   set the BBT page mask to see if this BBT should be rewritten */
-                        if ((this->options & BBT_AUTO_REFRESH) && (this->bbt_td->options & NAND_BBT_PERCHIP)) {
-                                bbt_masked_page = this->bbt_td->pages[chipnr] & BBT_PAGE_MASK;
-                        }
+                        chip->select_chip(mtd, -1);
+                        chip->select_chip(mtd, chipnr);
 
+                        /*
+                         * If BBT requires refresh and BBT-PERCHIP, set the BBT
+                         * page mask to see if this BBT should be rewritten
+                         */
+                        if (bbt_masked_page != 0xffffffff &&
+                            (chip->bbt_td->options & NAND_BBT_PERCHIP))
+                                bbt_masked_page = chip->bbt_td->pages[chipnr] &
+                                        BBT_PAGE_MASK;
                 }
         }
         instr->state = MTD_ERASE_DONE;
 
-erase_exit:
+ erase_exit:
 
         ret = instr->state == MTD_ERASE_DONE ? 0 : -EIO;
         /* Do call back function */
@@ -2231,16 +2013,21 @@ erase_exit:
         /* Deselect and wake up anyone waiting on the device */
         nand_release_device(mtd);
 
-        /* if BBT requires refresh and erase was successful, rewrite any selected bad block tables */
-        if ((this->options & BBT_AUTO_REFRESH) && (!ret)) {
-                for (chipnr = 0; chipnr < this->numchips; chipnr++) {
-                        if (rewrite_bbt[chipnr]) {
-                                /* update the BBT for chip */
-                                DEBUG (MTD_DEBUG_LEVEL0, "nand_erase_nand: nand_update_bbt (%d:0x%0x 0x%0x)\n",
-                                        chipnr, rewrite_bbt[chipnr], this->bbt_td->pages[chipnr]);
-                                nand_update_bbt (mtd, rewrite_bbt[chipnr]);
-                        }
-                }
+        /*
+         * If BBT requires refresh and erase was successful, rewrite any
+         * selected bad block tables
+         */
+        if (bbt_masked_page == 0xffffffff || ret)
+                return ret;
+
+        for (chipnr = 0; chipnr < chip->numchips; chipnr++) {
+                if (!rewrite_bbt[chipnr])
+                        continue;
+                /* update the BBT for chip */
+                DEBUG(MTD_DEBUG_LEVEL0, "nand_erase_nand: nand_update_bbt "
+                      "(%d:0x%0x 0x%0x)\n", chipnr, rewrite_bbt[chipnr],
+                      chip->bbt_td->pages[chipnr]);
+                nand_update_bbt(mtd, rewrite_bbt[chipnr]);
         }
 
         /* Return more or less happy */
@@ -2253,51 +2040,50 @@ erase_exit:
  *
  * Sync is actually a wait for chip ready function
  */
-static void nand_sync (struct mtd_info *mtd)
+static void nand_sync(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
-        DEBUG (MTD_DEBUG_LEVEL3, "nand_sync: called\n");
+        DEBUG(MTD_DEBUG_LEVEL3, "nand_sync: called\n");
 
         /* Grab the lock and see if the device is available */
-        nand_get_device (this, mtd, FL_SYNCING);
+        nand_get_device(chip, mtd, FL_SYNCING);
         /* Release it and go back */
-        nand_release_device (mtd);
+        nand_release_device(mtd);
 }
 
-
 /**
- * nand_block_isbad - [MTD Interface] Check whether the block at the given offset is bad
+ * nand_block_isbad - [MTD Interface] Check if block at offset is bad
  * @mtd:        MTD device structure
  * @ofs:        offset relative to mtd start
  */
-static int nand_block_isbad (struct mtd_info *mtd, loff_t ofs)
+static int nand_block_isbad(struct mtd_info *mtd, loff_t offs)
 {
         /* Check for invalid offset */
-        if (ofs > mtd->size)
+        if (offs > mtd->size)
                 return -EINVAL;
 
-        return nand_block_checkbad (mtd, ofs, 1, 0);
+        return nand_block_checkbad(mtd, offs, 1, 0);
 }
 
 /**
- * nand_block_markbad - [MTD Interface] Mark the block at the given offset as bad
+ * nand_block_markbad - [MTD Interface] Mark block at the given offset as bad
  * @mtd:        MTD device structure
  * @ofs:        offset relative to mtd start
  */
-static int nand_block_markbad (struct mtd_info *mtd, loff_t ofs)
+static int nand_block_markbad(struct mtd_info *mtd, loff_t ofs)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
         int ret;
 
-        if ((ret = nand_block_isbad(mtd, ofs))) {
-                /* If it was bad already, return success and do nothing. */
+        if ((ret = nand_block_isbad(mtd, ofs))) {
+                /* If it was bad already, return success and do nothing. */
                 if (ret > 0)
                         return 0;
-                return ret;
-        }
+                return ret;
+        }
 
-        return this->block_markbad(mtd, ofs);
+        return chip->block_markbad(mtd, ofs);
 }
 
 /**
@@ -2306,9 +2092,9 @@ static int nand_block_markbad (struct mtd_info *mtd, loff_t ofs)
  */
 static int nand_suspend(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
-        return nand_get_device (this, mtd, FL_PM_SUSPENDED);
+        return nand_get_device(chip, mtd, FL_PM_SUSPENDED);
 }
 
 /**
@@ -2317,373 +2103,385 @@ static int nand_suspend(struct mtd_info *mtd)
  */
 static void nand_resume(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
-        if (this->state == FL_PM_SUSPENDED)
+        if (chip->state == FL_PM_SUSPENDED)
                 nand_release_device(mtd);
         else
-                printk(KERN_ERR "resume() called for the chip which is not "
-                                "in suspended state\n");
-
+                printk(KERN_ERR "nand_resume() called for a chip which is not "
+                       "in suspended state\n");
 }
 
-
-/**
- * nand_scan - [NAND Interface] Scan for the NAND device
- * @mtd:        MTD device structure
- * @maxchips:   Number of chips to scan for
- *
- * This fills out all the not initialized function pointers
- * with the defaults.
- * The flash ID is read and the mtd/chip structures are
- * filled with the appropriate values. Buffers are allocated if
- * they are not provided by the board driver
- *
+/*
+ * Set default functions
  */
-int nand_scan (struct mtd_info *mtd, int maxchips)
+static void nand_set_defaults(struct nand_chip *chip, int busw)
 {
-        int i, nand_maf_id, nand_dev_id, busw, maf_id;
-        struct nand_chip *this = mtd->priv;
-
-        /* Get buswidth to select the correct functions*/
-        busw = this->options & NAND_BUSWIDTH_16;
-
         /* check for proper chip_delay setup, set 20us if not */
-        if (!this->chip_delay)
-                this->chip_delay = 20;
+        if (!chip->chip_delay)
+                chip->chip_delay = 20;
 
         /* check, if a user supplied command function given */
-        if (this->cmdfunc == NULL)
-                this->cmdfunc = nand_command;
+        if (chip->cmdfunc == NULL)
+                chip->cmdfunc = nand_command;
 
         /* check, if a user supplied wait function given */
-        if (this->waitfunc == NULL)
-                this->waitfunc = nand_wait;
-
-        if (!this->select_chip)
-                this->select_chip = nand_select_chip;
-        if (!this->write_byte)
-                this->write_byte = busw ? nand_write_byte16 : nand_write_byte;
-        if (!this->read_byte)
-                this->read_byte = busw ? nand_read_byte16 : nand_read_byte;
-        if (!this->write_word)
-                this->write_word = nand_write_word;
-        if (!this->read_word)
-                this->read_word = nand_read_word;
-        if (!this->block_bad)
-                this->block_bad = nand_block_bad;
-        if (!this->block_markbad)
-                this->block_markbad = nand_default_block_markbad;
-        if (!this->write_buf)
-                this->write_buf = busw ? nand_write_buf16 : nand_write_buf;
-        if (!this->read_buf)
-                this->read_buf = busw ? nand_read_buf16 : nand_read_buf;
-        if (!this->verify_buf)
-                this->verify_buf = busw ? nand_verify_buf16 : nand_verify_buf;
-        if (!this->scan_bbt)
-                this->scan_bbt = nand_default_bbt;
+        if (chip->waitfunc == NULL)
+                chip->waitfunc = nand_wait;
+
+        if (!chip->select_chip)
+                chip->select_chip = nand_select_chip;
+        if (!chip->read_byte)
+                chip->read_byte = busw ? nand_read_byte16 : nand_read_byte;
+        if (!chip->read_word)
+                chip->read_word = nand_read_word;
+        if (!chip->block_bad)
+                chip->block_bad = nand_block_bad;
+        if (!chip->block_markbad)
+                chip->block_markbad = nand_default_block_markbad;
+        if (!chip->write_buf)
+                chip->write_buf = busw ? nand_write_buf16 : nand_write_buf;
+        if (!chip->read_buf)
+                chip->read_buf = busw ? nand_read_buf16 : nand_read_buf;
+        if (!chip->verify_buf)
+                chip->verify_buf = busw ? nand_verify_buf16 : nand_verify_buf;
+        if (!chip->scan_bbt)
+                chip->scan_bbt = nand_default_bbt;
+
+        if (!chip->controller) {
+                chip->controller = &chip->hwcontrol;
+                spin_lock_init(&chip->controller->lock);
+                init_waitqueue_head(&chip->controller->wq);
+        }
+
+}
+
+/*
+ * Get the flash and manufacturer id and lookup if the type is supported
+ */
+static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
+                                                  struct nand_chip *chip,
+                                                  int busw, int *maf_id)
+{
+        struct nand_flash_dev *type = NULL;
+        int i, dev_id, maf_idx;
 
         /* Select the device */
-        this->select_chip(mtd, 0);
+        chip->select_chip(mtd, 0);
 
         /* Send the command for reading device ID */
-        this->cmdfunc (mtd, NAND_CMD_READID, 0x00, -1);
+        chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);
 
         /* Read manufacturer and device IDs */
-        nand_maf_id = this->read_byte(mtd);
-        nand_dev_id = this->read_byte(mtd);
+        *maf_id = chip->read_byte(mtd);
+        dev_id = chip->read_byte(mtd);
 
-        /* Print and store flash device information */
+        /* Lookup the flash id */
         for (i = 0; nand_flash_ids[i].name != NULL; i++) {
+                if (dev_id == nand_flash_ids[i].id) {
+                        type =  &nand_flash_ids[i];
+                        break;
+                }
+        }
 
-                if (nand_dev_id != nand_flash_ids[i].id)
-                        continue;
+        if (!type)
+                return ERR_PTR(-ENODEV);
+
+        if (!mtd->name)
+                mtd->name = type->name;
+
+        chip->chipsize = type->chipsize << 20;
+
+        /* Newer devices have all the information in additional id bytes */
+        if (!type->pagesize) {
+                int extid;
+                /* The 3rd id byte contains non relevant data ATM */
+                extid = chip->read_byte(mtd);
+                /* The 4th id byte is the important one */
+                extid = chip->read_byte(mtd);
+                /* Calc pagesize */
+                mtd->writesize = 1024 << (extid & 0x3);
+                extid >>= 2;
+                /* Calc oobsize */
+                mtd->oobsize = (8 << (extid & 0x01)) * (mtd->writesize >> 9);
+                extid >>= 2;
+                /* Calc blocksize. Blocksize is multiples of 64KiB */
+                mtd->erasesize = (64 * 1024) << (extid & 0x03);
+                extid >>= 2;
+                /* Get buswidth information */
+                busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
 
-                if (!mtd->name) mtd->name = nand_flash_ids[i].name;
-                this->chipsize = nand_flash_ids[i].chipsize << 20;
-
-                /* New devices have all the information in additional id bytes */
-                if (!nand_flash_ids[i].pagesize) {
-                        int extid;
-                        /* The 3rd id byte contains non relevant data ATM */
-                        extid = this->read_byte(mtd);
-                        /* The 4th id byte is the important one */
-                        extid = this->read_byte(mtd);
-                        /* Calc pagesize */
-                        mtd->oobblock = 1024 << (extid & 0x3);
-                        extid >>= 2;
-                        /* Calc oobsize */
-                        mtd->oobsize = (8 << (extid & 0x01)) * (mtd->oobblock >> 9);
-                        extid >>= 2;
-                        /* Calc blocksize. Blocksize is multiples of 64KiB */
-                        mtd->erasesize = (64 * 1024)  << (extid & 0x03);
-                        extid >>= 2;
-                        /* Get buswidth information */
-                        busw = (extid & 0x01) ? NAND_BUSWIDTH_16 : 0;
+        } else {
+                /*
+                 * Old devices have chip data hardcoded in the device id table
+                 */
+                mtd->erasesize = type->erasesize;
+                mtd->writesize = type->pagesize;
+                mtd->oobsize = mtd->writesize / 32;
+                busw = type->options & NAND_BUSWIDTH_16;
+        }
 
-                } else {
-                        /* Old devices have this data hardcoded in the
-                         * device id table */
-                        mtd->erasesize = nand_flash_ids[i].erasesize;
-                        mtd->oobblock = nand_flash_ids[i].pagesize;
-                        mtd->oobsize = mtd->oobblock / 32;
-                        busw = nand_flash_ids[i].options & NAND_BUSWIDTH_16;
-                }
+        /* Try to identify manufacturer */
+        for (maf_idx = 0; nand_manuf_ids[maf_idx].id != 0x0; maf_id++) {
+                if (nand_manuf_ids[maf_idx].id == *maf_id)
+                        break;
+        }
 
-                /* Try to identify manufacturer */
-                for (maf_id = 0; nand_manuf_ids[maf_id].id != 0x0; maf_id++) {
-                        if (nand_manuf_ids[maf_id].id == nand_maf_id)
-                                break;
-                }
+        /*
+         * Check, if buswidth is correct. Hardware drivers should set
+         * chip correct !
+         */
+        if (busw != (chip->options & NAND_BUSWIDTH_16)) {
+                printk(KERN_INFO "NAND device: Manufacturer ID:"
+                       " 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id,
+                       dev_id, nand_manuf_ids[maf_idx].name, mtd->name);
+                printk(KERN_WARNING "NAND bus width %d instead %d bit\n",
+                       (chip->options & NAND_BUSWIDTH_16) ? 16 : 8,
+                       busw ? 16 : 8);
+                return ERR_PTR(-EINVAL);
+        }
 
-                /* Check, if buswidth is correct. Hardware drivers should set
-                 * this correct ! */
-                if (busw != (this->options & NAND_BUSWIDTH_16)) {
-                        printk (KERN_INFO "NAND device: Manufacturer ID:"
-                                " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id,
-                                nand_manuf_ids[maf_id].name , mtd->name);
-                        printk (KERN_WARNING
-                                "NAND bus width %d instead %d bit\n",
-                                        (this->options & NAND_BUSWIDTH_16) ? 16 : 8,
-                                        busw ? 16 : 8);
-                        this->select_chip(mtd, -1);
-                        return 1;
-                }
+        /* Calculate the address shift from the page size */
+        chip->page_shift = ffs(mtd->writesize) - 1;
+        /* Convert chipsize to number of pages per chip -1. */
+        chip->pagemask = (chip->chipsize >> chip->page_shift) - 1;
 
-                /* Calculate the address shift from the page size */
-                this->page_shift = ffs(mtd->oobblock) - 1;
-                this->bbt_erase_shift = this->phys_erase_shift = ffs(mtd->erasesize) - 1;
-                this->chip_shift = ffs(this->chipsize) - 1;
-
-                /* Set the bad block position */
-                this->badblockpos = mtd->oobblock > 512 ?
-                        NAND_LARGE_BADBLOCK_POS : NAND_SMALL_BADBLOCK_POS;
-
-                /* Get chip options, preserve non chip based options */
-                this->options &= ~NAND_CHIPOPTIONS_MSK;
-                this->options |= nand_flash_ids[i].options & NAND_CHIPOPTIONS_MSK;
-                /* Set this as a default. Board drivers can override it, if neccecary */
-                this->options |= NAND_NO_AUTOINCR;
-                /* Check if this is a not a samsung device. Do not clear the options
-                 * for chips which are not having an extended id.
-                 */
-                if (nand_maf_id != NAND_MFR_SAMSUNG && !nand_flash_ids[i].pagesize)
-                        this->options &= ~NAND_SAMSUNG_LP_OPTIONS;
+        chip->bbt_erase_shift = chip->phys_erase_shift =
+                ffs(mtd->erasesize) - 1;
+        chip->chip_shift = ffs(chip->chipsize) - 1;
 
-                /* Check for AND chips with 4 page planes */
-                if (this->options & NAND_4PAGE_ARRAY)
-                        this->erase_cmd = multi_erase_cmd;
-                else
-                        this->erase_cmd = single_erase_cmd;
+        /* Set the bad block position */
+        chip->badblockpos = mtd->writesize > 512 ?
+                NAND_LARGE_BADBLOCK_POS : NAND_SMALL_BADBLOCK_POS;
 
-                /* Do not replace user supplied command function ! */
-                if (mtd->oobblock > 512 && this->cmdfunc == nand_command)
-                        this->cmdfunc = nand_command_lp;
+        /* Get chip options, preserve non chip based options */
+        chip->options &= ~NAND_CHIPOPTIONS_MSK;
+        chip->options |= type->options & NAND_CHIPOPTIONS_MSK;
 
-                printk (KERN_INFO "NAND device: Manufacturer ID:"
-                        " 0x%02x, Chip ID: 0x%02x (%s %s)\n", nand_maf_id, nand_dev_id,
-                        nand_manuf_ids[maf_id].name , nand_flash_ids[i].name);
-                break;
-        }
+        /*
+         * Set chip as a default. Board drivers can override it, if necessary
+         */
+        chip->options |= NAND_NO_AUTOINCR;
+
+        /* Check if chip is a not a samsung device. Do not clear the
+         * options for chips which are not having an extended id.
+         */
+        if (*maf_id != NAND_MFR_SAMSUNG && !type->pagesize)
+                chip->options &= ~NAND_SAMSUNG_LP_OPTIONS;
+
+        /* Check for AND chips with 4 page planes */
+        if (chip->options & NAND_4PAGE_ARRAY)
+                chip->erase_cmd = multi_erase_cmd;
+        else
+                chip->erase_cmd = single_erase_cmd;
+
+        /* Do not replace user supplied command function ! */
+        if (mtd->writesize > 512 && chip->cmdfunc == nand_command)
+                chip->cmdfunc = nand_command_lp;
+
+        printk(KERN_INFO "NAND device: Manufacturer ID:"
+               " 0x%02x, Chip ID: 0x%02x (%s %s)\n", *maf_id, dev_id,
+               nand_manuf_ids[maf_idx].name, type->name);
+
+        return type;
+}
+
+/* module_text_address() isn't exported, and it's mostly a pointless
+   test if this is a module _anyway_ -- they'd have to try _really_ hard
+   to call us from in-kernel code if the core NAND support is modular. */
+#ifdef MODULE
+#define caller_is_module() (1)
+#else
+#define caller_is_module() \
+        module_text_address((unsigned long)__builtin_return_address(0))
+#endif
 
-        if (!nand_flash_ids[i].name) {
-                printk (KERN_WARNING "No NAND device found!!!\n");
-                this->select_chip(mtd, -1);
-                return 1;
+/**
+ * nand_scan - [NAND Interface] Scan for the NAND device
+ * @mtd:        MTD device structure
+ * @maxchips:   Number of chips to scan for
+ *
+ * This fills out all the uninitialized function pointers
+ * with the defaults.
+ * The flash ID is read and the mtd/chip structures are
+ * filled with the appropriate values.
+ * The mtd->owner field must be set to the module of the caller
+ *
+ */
+int nand_scan(struct mtd_info *mtd, int maxchips)
+{
+        int i, busw, nand_maf_id;
+        struct nand_chip *chip = mtd->priv;
+        struct nand_flash_dev *type;
+
+        /* Many callers got this wrong, so check for it for a while... */
+        if (!mtd->owner && caller_is_module()) {
+                printk(KERN_CRIT "nand_scan() called with NULL mtd->owner!\n");
+                BUG();
         }
 
-        for (i=1; i < maxchips; i++) {
-                this->select_chip(mtd, i);
+        /* Get buswidth to select the correct functions */
+        busw = chip->options & NAND_BUSWIDTH_16;
+        /* Set the default functions */
+        nand_set_defaults(chip, busw);
 
-                /* Send the command for reading device ID */
-                this->cmdfunc (mtd, NAND_CMD_READID, 0x00, -1);
+        /* Read the flash type */
+        type = nand_get_flash_type(mtd, chip, busw, &nand_maf_id);
+
+        if (IS_ERR(type)) {
+                printk(KERN_WARNING "No NAND device found!!!\n");
+                chip->select_chip(mtd, -1);
+                return PTR_ERR(type);
+        }
 
+        /* Check for a chip array */
+        for (i = 1; i < maxchips; i++) {
+                chip->select_chip(mtd, i);
+                /* Send the command for reading device ID */
+                chip->cmdfunc(mtd, NAND_CMD_READID, 0x00, -1);
                 /* Read manufacturer and device IDs */
-                if (nand_maf_id != this->read_byte(mtd) ||
-                    nand_dev_id != this->read_byte(mtd))
+                if (nand_maf_id != chip->read_byte(mtd) ||
+                    type->id != chip->read_byte(mtd))
                         break;
         }
         if (i > 1)
                 printk(KERN_INFO "%d NAND chips detected\n", i);
 
-        /* Allocate buffers, if neccecary */
-        if (!this->oob_buf) {
-                size_t len;
-                len = mtd->oobsize << (this->phys_erase_shift - this->page_shift);
-                this->oob_buf = kmalloc (len, GFP_KERNEL);
-                if (!this->oob_buf) {
-                        printk (KERN_ERR "nand_scan(): Cannot allocate oob_buf\n");
-                        return -ENOMEM;
-                }
-                this->options |= NAND_OOBBUF_ALLOC;
-        }
+        /* Store the number of chips and calc total size for mtd */
+        chip->numchips = i;
+        mtd->size = i * chip->chipsize;
 
-        if (!this->data_buf) {
-                size_t len;
-                len = mtd->oobblock + mtd->oobsize;
-                this->data_buf = kmalloc (len, GFP_KERNEL);
-                if (!this->data_buf) {
-                        if (this->options & NAND_OOBBUF_ALLOC)
-                                kfree (this->oob_buf);
-                        printk (KERN_ERR "nand_scan(): Cannot allocate data_buf\n");
-                        return -ENOMEM;
-                }
-                this->options |= NAND_DATABUF_ALLOC;
-        }
+        /* Preset the internal oob write buffer */
+        memset(chip->buffers.oobwbuf, 0xff, mtd->oobsize);
 
-        /* Store the number of chips and calc total size for mtd */
-        this->numchips = i;
-        mtd->size = i * this->chipsize;
-        /* Convert chipsize to number of pages per chip -1. */
-        this->pagemask = (this->chipsize >> this->page_shift) - 1;
-        /* Preset the internal oob buffer */
-        memset(this->oob_buf, 0xff, mtd->oobsize << (this->phys_erase_shift - this->page_shift));
-
-        /* If no default placement scheme is given, select an
-         * appropriate one */
-        if (!this->autooob) {
-                /* Select the appropriate default oob placement scheme for
-                 * placement agnostic filesystems */
+        /*
+         * If no default placement scheme is given, select an appropriate one
+         */
+        if (!chip->ecc.layout) {
                 switch (mtd->oobsize) {
                 case 8:
-                        this->autooob = &nand_oob_8;
+                        chip->ecc.layout = &nand_oob_8;
                         break;
                 case 16:
-                        this->autooob = &nand_oob_16;
+                        chip->ecc.layout = &nand_oob_16;
                         break;
                 case 64:
-                        this->autooob = &nand_oob_64;
+                        chip->ecc.layout = &nand_oob_64;
                         break;
                 default:
-                        printk (KERN_WARNING "No oob scheme defined for oobsize %d\n",
-                                mtd->oobsize);
+                        printk(KERN_WARNING "No oob scheme defined for "
+                               "oobsize %d\n", mtd->oobsize);
                         BUG();
                 }
         }
 
-        /* The number of bytes available for the filesystem to place fs dependend
-         * oob data */
-        mtd->oobavail = 0;
-        for (i = 0; this->autooob->oobfree[i][1]; i++)
-                mtd->oobavail += this->autooob->oobfree[i][1];
-
         /*
-         * check ECC mode, default to software
-         * if 3byte/512byte hardware ECC is selected and we have 256 byte pagesize
-         * fallback to software ECC
-        */
-        this->eccsize = 256;    /* set default eccsize */
-        this->eccbytes = 3;
-
-        switch (this->eccmode) {
-        case NAND_ECC_HW12_2048:
-                if (mtd->oobblock < 2048) {
-                        printk(KERN_WARNING "2048 byte HW ECC not possible on %d byte page size, fallback to SW ECC\n",
-                               mtd->oobblock);
-                        this->eccmode = NAND_ECC_SOFT;
-                        this->calculate_ecc = nand_calculate_ecc;
-                        this->correct_data = nand_correct_data;
-                } else
-                        this->eccsize = 2048;
-                break;
-
-        case NAND_ECC_HW3_512:
-        case NAND_ECC_HW6_512:
-        case NAND_ECC_HW8_512:
-                if (mtd->oobblock == 256) {
-                        printk (KERN_WARNING "512 byte HW ECC not possible on 256 Byte pagesize, fallback to SW ECC \n");
-                        this->eccmode = NAND_ECC_SOFT;
-                        this->calculate_ecc = nand_calculate_ecc;
-                        this->correct_data = nand_correct_data;
-                } else
-                        this->eccsize = 512; /* set eccsize to 512 */
-                break;
+         * check ECC mode, default to software if 3byte/512byte hardware ECC is
+         * selected and we have 256 byte pagesize fallback to software ECC
+         */
+        switch (chip->ecc.mode) {
+        case NAND_ECC_HW:
+                /* Use standard hwecc read page function ? */
+                if (!chip->ecc.read_page)
+                        chip->ecc.read_page = nand_read_page_hwecc;
+                if (!chip->ecc.write_page)
+                        chip->ecc.write_page = nand_write_page_hwecc;
+                if (!chip->ecc.read_oob)
+                        chip->ecc.read_oob = nand_read_oob_std;
+                if (!chip->ecc.write_oob)
+                        chip->ecc.write_oob = nand_write_oob_std;
+
+        case NAND_ECC_HW_SYNDROME:
+                if (!chip->ecc.calculate || !chip->ecc.correct ||
+                    !chip->ecc.hwctl) {
+                        printk(KERN_WARNING "No ECC functions supplied, "
+                               "Hardware ECC not possible\n");
+                        BUG();
+                }
+                /* Use standard syndrome read/write page function ? */
+                if (!chip->ecc.read_page)
+                        chip->ecc.read_page = nand_read_page_syndrome;
+                if (!chip->ecc.write_page)
+                        chip->ecc.write_page = nand_write_page_syndrome;
+                if (!chip->ecc.read_oob)
+                        chip->ecc.read_oob = nand_read_oob_syndrome;
+                if (!chip->ecc.write_oob)
+                        chip->ecc.write_oob = nand_write_oob_syndrome;
+
+                if (mtd->writesize >= chip->ecc.size)
+                        break;
+                printk(KERN_WARNING "%d byte HW ECC not possible on "
+                       "%d byte page size, fallback to SW ECC\n",
+                       chip->ecc.size, mtd->writesize);
+                chip->ecc.mode = NAND_ECC_SOFT;
 
-        case NAND_ECC_HW3_256:
+        case NAND_ECC_SOFT:
+                chip->ecc.calculate = nand_calculate_ecc;
+                chip->ecc.correct = nand_correct_data;
+                chip->ecc.read_page = nand_read_page_swecc;
+                chip->ecc.write_page = nand_write_page_swecc;
+                chip->ecc.read_oob = nand_read_oob_std;
+                chip->ecc.write_oob = nand_write_oob_std;
+                chip->ecc.size = 256;
+                chip->ecc.bytes = 3;
                 break;
 
         case NAND_ECC_NONE:
-                printk (KERN_WARNING "NAND_ECC_NONE selected by board driver. This is not recommended !!\n");
-                this->eccmode = NAND_ECC_NONE;
+                printk(KERN_WARNING "NAND_ECC_NONE selected by board driver. "
+                       "This is not recommended !!\n");
+                chip->ecc.read_page = nand_read_page_raw;
+                chip->ecc.write_page = nand_write_page_raw;
+                chip->ecc.read_oob = nand_read_oob_std;
+                chip->ecc.write_oob = nand_write_oob_std;
+                chip->ecc.size = mtd->writesize;
+                chip->ecc.bytes = 0;
                 break;
-
-        case NAND_ECC_SOFT:
-                this->calculate_ecc = nand_calculate_ecc;
-                this->correct_data = nand_correct_data;
-                break;
-
         default:
-                printk (KERN_WARNING "Invalid NAND_ECC_MODE %d\n", this->eccmode);
-                BUG();
-        }
-
-        /* Check hardware ecc function availability and adjust number of ecc bytes per
-         * calculation step
-        */
-        switch (this->eccmode) {
-        case NAND_ECC_HW12_2048:
-                this->eccbytes += 4;
-        case NAND_ECC_HW8_512:
-                this->eccbytes += 2;
-        case NAND_ECC_HW6_512:
-                this->eccbytes += 3;
-        case NAND_ECC_HW3_512:
-        case NAND_ECC_HW3_256:
-                if (this->calculate_ecc && this->correct_data && this->enable_hwecc)
-                        break;
-                printk (KERN_WARNING "No ECC functions supplied, Hardware ECC not possible\n");
+                printk(KERN_WARNING "Invalid NAND_ECC_MODE %d\n",
+                       chip->ecc.mode);
                 BUG();
         }
 
-        mtd->eccsize = this->eccsize;
-
-        /* Set the number of read / write steps for one page to ensure ECC generation */
-        switch (this->eccmode) {
-        case NAND_ECC_HW12_2048:
-                this->eccsteps = mtd->oobblock / 2048;
-                break;
-        case NAND_ECC_HW3_512:
-        case NAND_ECC_HW6_512:
-        case NAND_ECC_HW8_512:
-                this->eccsteps = mtd->oobblock / 512;
-                break;
-        case NAND_ECC_HW3_256:
-        case NAND_ECC_SOFT:
-                this->eccsteps = mtd->oobblock / 256;
-                break;
+        /*
+         * The number of bytes available for a client to place data into
+         * the out of band area
+         */
+        chip->ecc.layout->oobavail = 0;
+        for (i = 0; chip->ecc.layout->oobfree[i].length; i++)
+                chip->ecc.layout->oobavail +=
+                        chip->ecc.layout->oobfree[i].length;
 
-        case NAND_ECC_NONE:
-                this->eccsteps = 1;
-                break;
+        /*
+         * Set the number of read / write steps for one page depending on ECC
+         * mode
+         */
+        chip->ecc.steps = mtd->writesize / chip->ecc.size;
+        if(chip->ecc.steps * chip->ecc.size != mtd->writesize) {
+                printk(KERN_WARNING "Invalid ecc parameters\n");
+                BUG();
         }
+        chip->ecc.total = chip->ecc.steps * chip->ecc.bytes;
 
-        /* Initialize state, waitqueue and spinlock */
-        this->state = FL_READY;
-        init_waitqueue_head (&this->wq);
-        spin_lock_init (&this->chip_lock);
+        /* Initialize state */
+        chip->state = FL_READY;
 
         /* De-select the device */
-        this->select_chip(mtd, -1);
+        chip->select_chip(mtd, -1);
 
         /* Invalidate the pagebuffer reference */
-        this->pagebuf = -1;
+        chip->pagebuf = -1;
 
         /* Fill in remaining MTD driver data */
         mtd->type = MTD_NANDFLASH;
-        mtd->flags = MTD_CAP_NANDFLASH | MTD_ECC;
+        mtd->flags = MTD_CAP_NANDFLASH;
         mtd->ecctype = MTD_ECC_SW;
         mtd->erase = nand_erase;
         mtd->point = NULL;
         mtd->unpoint = NULL;
         mtd->read = nand_read;
         mtd->write = nand_write;
-        mtd->read_ecc = nand_read_ecc;
-        mtd->write_ecc = nand_write_ecc;
         mtd->read_oob = nand_read_oob;
         mtd->write_oob = nand_write_oob;
-        mtd->readv = NULL;
-        mtd->writev = nand_writev;
-        mtd->writev_ecc = nand_writev_ecc;
         mtd->sync = nand_sync;
         mtd->lock = NULL;
         mtd->unlock = NULL;
@@ -2692,47 +2490,38 @@ int nand_scan (struct mtd_info *mtd, int maxchips)
         mtd->block_isbad = nand_block_isbad;
         mtd->block_markbad = nand_block_markbad;
 
-        /* and make the autooob the default one */
-        memcpy(&mtd->oobinfo, this->autooob, sizeof(mtd->oobinfo));
-
-        mtd->owner = THIS_MODULE;
+        /* propagate ecc.layout to mtd_info */
+        mtd->ecclayout = chip->ecc.layout;
 
         /* Check, if we should skip the bad block table scan */
-        if (this->options & NAND_SKIP_BBTSCAN)
+        if (chip->options & NAND_SKIP_BBTSCAN)
                 return 0;
 
         /* Build bad block table */
-        return this->scan_bbt (mtd);
+        return chip->scan_bbt(mtd);
 }
 
 /**
  * nand_release - [NAND Interface] Free resources held by the NAND device
  * @mtd:        MTD device structure
 */
-void nand_release (struct mtd_info *mtd)
+void nand_release(struct mtd_info *mtd)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *chip = mtd->priv;
 
 #ifdef CONFIG_MTD_PARTITIONS
         /* Deregister partitions */
-        del_mtd_partitions (mtd);
+        del_mtd_partitions(mtd);
 #endif
         /* Deregister the device */
-        del_mtd_device (mtd);
+        del_mtd_device(mtd);
 
         /* Free bad block table memory */
-        kfree (this->bbt);
-        /* Buffer allocated by nand_scan ? */
-        if (this->options & NAND_OOBBUF_ALLOC)
-                kfree (this->oob_buf);
-        /* Buffer allocated by nand_scan ? */
-        if (this->options & NAND_DATABUF_ALLOC)
-                kfree (this->data_buf);
+        kfree(chip->bbt);
 }
 
-EXPORT_SYMBOL_GPL (nand_scan);
-EXPORT_SYMBOL_GPL (nand_release);
-
+EXPORT_SYMBOL_GPL(nand_scan);
+EXPORT_SYMBOL_GPL(nand_release);
 
 static int __init nand_base_init(void)
 {
@@ -2748,6 +2537,6 @@ static void __exit nand_base_exit(void)
 module_init(nand_base_init);
 module_exit(nand_base_exit);
 
-MODULE_LICENSE ("GPL");
-MODULE_AUTHOR ("Steven J. Hill <sjhill@realitydiluted.com>, Thomas Gleixner <tglx@linutronix.de>");
-MODULE_DESCRIPTION ("Generic NAND flash driver code");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Steven J. Hill <sjhill@realitydiluted.com>, Thomas Gleixner <tglx@linutronix.de>");
+MODULE_DESCRIPTION("Generic NAND flash driver code");
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index ca286999fe08..a612c4ea8194 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -48,7 +48,7 @@
  *
  * Following assumptions are made:
  * - bbts start at a page boundary, if autolocated on a block boundary
- * - the space neccecary for a bbt in FLASH does not exceed a block boundary
+ * - the space necessary for a bbt in FLASH does not exceed a block boundary
  *
  */
 
@@ -60,7 +60,7 @@
 #include <linux/mtd/compatmac.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
-
+#include <linux/vmalloc.h>
 
 /**
  * check_pattern - [GENERIC] check if a pattern is in the buffer
@@ -75,7 +75,7 @@
  * pattern area contain 0xff
  *
 */
-static int check_pattern (uint8_t *buf, int len, int paglen, struct nand_bbt_descr *td)
+static int check_pattern(uint8_t *buf, int len, int paglen, struct nand_bbt_descr *td)
 {
         int i, end = 0;
         uint8_t *p = buf;
@@ -116,7 +116,7 @@ static int check_pattern (uint8_t *buf, int len, int paglen, struct nand_bbt_des
  * no optional empty check
  *
 */
-static int check_short_pattern (uint8_t *buf, struct nand_bbt_descr *td)
+static int check_short_pattern(uint8_t *buf, struct nand_bbt_descr *td)
 {
         int i;
         uint8_t *p = buf;
@@ -142,8 +142,8 @@ static int check_short_pattern (uint8_t *buf, struct nand_bbt_descr *td)
  * Read the bad block table starting from page.
  *
  */
-static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
-        int bits, int offs, int reserved_block_code)
+static int read_bbt(struct mtd_info *mtd, uint8_t *buf, int page, int num,
+                    int bits, int offs, int reserved_block_code)
 {
         int res, i, j, act = 0;
         struct nand_chip *this = mtd->priv;
@@ -152,17 +152,17 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
         uint8_t msk = (uint8_t) ((1 << bits) - 1);
 
         totlen = (num * bits) >> 3;
-        from = ((loff_t)page) << this->page_shift;
+        from = ((loff_t) page) << this->page_shift;
 
         while (totlen) {
-                len = min (totlen, (size_t) (1 << this->bbt_erase_shift));
-                res = mtd->read_ecc (mtd, from, len, &retlen, buf, NULL, this->autooob);
+                len = min(totlen, (size_t) (1 << this->bbt_erase_shift));
+                res = mtd->read(mtd, from, len, &retlen, buf);
                 if (res < 0) {
                         if (retlen != len) {
-                                printk (KERN_INFO "nand_bbt: Error reading bad block table\n");
+                                printk(KERN_INFO "nand_bbt: Error reading bad block table\n");
                                 return res;
                         }
-                        printk (KERN_WARNING "nand_bbt: ECC error while reading bad block table\n");
+                        printk(KERN_WARNING "nand_bbt: ECC error while reading bad block table\n");
                 }
 
                 /* Analyse data */
@@ -172,22 +172,23 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
                                 uint8_t tmp = (dat >> j) & msk;
                                 if (tmp == msk)
                                         continue;
-                                if (reserved_block_code &&
-                                    (tmp == reserved_block_code)) {
-                                        printk (KERN_DEBUG "nand_read_bbt: Reserved block at 0x%08x\n",
-                                                ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
+                                if (reserved_block_code && (tmp == reserved_block_code)) {
+                                        printk(KERN_DEBUG "nand_read_bbt: Reserved block at 0x%08x\n",
+                                               ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
                                         this->bbt[offs + (act >> 3)] |= 0x2 << (act & 0x06);
+                                        mtd->ecc_stats.bbtblocks++;
                                         continue;
                                 }
                                 /* Leave it for now, if its matured we can move this
                                  * message to MTD_DEBUG_LEVEL0 */
-                                printk (KERN_DEBUG "nand_read_bbt: Bad block at 0x%08x\n",
-                                        ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
+                                printk(KERN_DEBUG "nand_read_bbt: Bad block at 0x%08x\n",
+                                       ((offs << 2) + (act >> 1)) << this->bbt_erase_shift);
                                 /* Factory marked bad or worn out ? */
                                 if (tmp == 0)
                                         this->bbt[offs + (act >> 3)] |= 0x3 << (act & 0x06);
                                 else
                                         this->bbt[offs + (act >> 3)] |= 0x1 << (act & 0x06);
+                                mtd->ecc_stats.badblocks++;
                         }
                 }
                 totlen -= len;
@@ -207,7 +208,7 @@ static int read_bbt (struct mtd_info *mtd, uint8_t *buf, int page, int num,
  * Read the bad block table for all chips starting at a given page
  * We assume that the bbt bits are in consecutive order.
 */
-static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td, int chip)
+static int read_abs_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td, int chip)
 {
         struct nand_chip *this = mtd->priv;
         int res = 0, i;
@@ -231,6 +232,42 @@ static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
         return 0;
 }
 
+/*
+ * Scan read raw data from flash
+ */
+static int scan_read_raw(struct mtd_info *mtd, uint8_t *buf, loff_t offs,
+                         size_t len)
+{
+        struct mtd_oob_ops ops;
+
+        ops.mode = MTD_OOB_RAW;
+        ops.ooboffs = 0;
+        ops.ooblen = mtd->oobsize;
+        ops.oobbuf = buf;
+        ops.datbuf = buf;
+        ops.len = len;
+
+        return mtd->read_oob(mtd, offs, &ops);
+}
+
+/*
+ * Scan write data with oob to flash
+ */
+static int scan_write_bbt(struct mtd_info *mtd, loff_t offs, size_t len,
+                          uint8_t *buf, uint8_t *oob)
+{
+        struct mtd_oob_ops ops;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = 0;
+        ops.ooblen = mtd->oobsize;
+        ops.datbuf = buf;
+        ops.oobbuf = oob;
+        ops.len = len;
+
+        return mtd->write_oob(mtd, offs, &ops);
+}
+
 /**
  * read_abs_bbts - [GENERIC] Read the bad block table(s) for all chips starting at a given page
  * @mtd:        MTD device structure
@@ -242,28 +279,85 @@ static int read_abs_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
  * We assume that the bbt bits are in consecutive order.
  *
 */
-static int read_abs_bbts (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td,
-        struct nand_bbt_descr *md)
+static int read_abs_bbts(struct mtd_info *mtd, uint8_t *buf,
+                         struct nand_bbt_descr *td, struct nand_bbt_descr *md)
 {
         struct nand_chip *this = mtd->priv;
 
         /* Read the primary version, if available */
         if (td->options & NAND_BBT_VERSION) {
-                nand_read_raw (mtd, buf, td->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize);
-                td->version[0] = buf[mtd->oobblock + td->veroffs];
-                printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", td->pages[0], td->version[0]);
+                scan_read_raw(mtd, buf, td->pages[0] << this->page_shift,
+                              mtd->writesize);
+                td->version[0] = buf[mtd->writesize + td->veroffs];
+                printk(KERN_DEBUG "Bad block table at page %d, version 0x%02X\n",
+                       td->pages[0], td->version[0]);
         }
 
         /* Read the mirror version, if available */
         if (md && (md->options & NAND_BBT_VERSION)) {
-                nand_read_raw (mtd, buf, md->pages[0] << this->page_shift, mtd->oobblock, mtd->oobsize);
-                md->version[0] = buf[mtd->oobblock + md->veroffs];
-                printk (KERN_DEBUG "Bad block table at page %d, version 0x%02X\n", md->pages[0], md->version[0]);
+                scan_read_raw(mtd, buf, md->pages[0] << this->page_shift,
+                              mtd->writesize);
+                md->version[0] = buf[mtd->writesize + md->veroffs];
+                printk(KERN_DEBUG "Bad block table at page %d, version 0x%02X\n",
+                       md->pages[0], md->version[0]);
         }
-
         return 1;
 }
 
+/*
+ * Scan a given block full
+ */
+static int scan_block_full(struct mtd_info *mtd, struct nand_bbt_descr *bd,
+                           loff_t offs, uint8_t *buf, size_t readlen,
+                           int scanlen, int len)
+{
+        int ret, j;
+
+        ret = scan_read_raw(mtd, buf, offs, readlen);
+        if (ret)
+                return ret;
+
+        for (j = 0; j < len; j++, buf += scanlen) {
+                if (check_pattern(buf, scanlen, mtd->writesize, bd))
+                        return 1;
+        }
+        return 0;
+}
+
+/*
+ * Scan a given block partially
+ */
+static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd,
+                           loff_t offs, uint8_t *buf, int len)
+{
+        struct mtd_oob_ops ops;
+        int j, ret;
+
+        ops.len = mtd->oobsize;
+        ops.ooblen = mtd->oobsize;
+        ops.oobbuf = buf;
+        ops.ooboffs = 0;
+        ops.datbuf = NULL;
+        ops.mode = MTD_OOB_PLACE;
+
+        for (j = 0; j < len; j++) {
+                /*
+                 * Read the full oob until read_oob is fixed to
+                 * handle single byte reads for 16 bit
+                 * buswidth
+                 */
+                ret = mtd->read_oob(mtd, offs, &ops);
+                if (ret)
+                        return ret;
+
+                if (check_short_pattern(buf, bd))
+                        return 1;
+
+                offs += mtd->writesize;
+        }
+        return 0;
+}
+
 /**
  * create_bbt - [GENERIC] Create a bad block table by scanning the device
  * @mtd:        MTD device structure
@@ -275,15 +369,16 @@ static int read_abs_bbts (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_de
  * Create a bad block table by scanning the device
  * for the given good/bad block identify pattern
  */
-static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd, int chip)
+static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
+        struct nand_bbt_descr *bd, int chip)
 {
         struct nand_chip *this = mtd->priv;
-        int i, j, numblocks, len, scanlen;
+        int i, numblocks, len, scanlen;
         int startblock;
         loff_t from;
-        size_t readlen, ooblen;
+        size_t readlen;
 
-        printk (KERN_INFO "Scanning device for bad blocks\n");
+        printk(KERN_INFO "Scanning device for bad blocks\n");
 
         if (bd->options & NAND_BBT_SCANALLPAGES)
                 len = 1 << (this->bbt_erase_shift - this->page_shift);
@@ -296,25 +391,24 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
 
         if (!(bd->options & NAND_BBT_SCANEMPTY)) {
                 /* We need only read few bytes from the OOB area */
-                scanlen = ooblen = 0;
+                scanlen = 0;
                 readlen = bd->len;
         } else {
                 /* Full page content should be read */
-                scanlen = mtd->oobblock + mtd->oobsize;
-                readlen = len * mtd->oobblock;
-                ooblen = len * mtd->oobsize;
+                scanlen = mtd->writesize + mtd->oobsize;
+                readlen = len * mtd->writesize;
         }
 
         if (chip == -1) {
-                /* Note that numblocks is 2 * (real numblocks) here, see i+=2 below as it
-                 * makes shifting and masking less painful */
+                /* Note that numblocks is 2 * (real numblocks) here, see i+=2
+                 * below as it makes shifting and masking less painful */
                 numblocks = mtd->size >> (this->bbt_erase_shift - 1);
                 startblock = 0;
                 from = 0;
         } else {
                 if (chip >= this->numchips) {
-                        printk (KERN_WARNING "create_bbt(): chipnr (%d) > available chips (%d)\n",
-                                chip + 1, this->numchips);
+                        printk(KERN_WARNING "create_bbt(): chipnr (%d) > available chips (%d)\n",
+                               chip + 1, this->numchips);
                         return -EINVAL;
                 }
                 numblocks = this->chipsize >> (this->bbt_erase_shift - 1);
@@ -326,36 +420,22 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
         for (i = startblock; i < numblocks;) {
                 int ret;
 
-                if (bd->options & NAND_BBT_SCANEMPTY)
-                        if ((ret = nand_read_raw (mtd, buf, from, readlen, ooblen)))
-                                return ret;
-
-                for (j = 0; j < len; j++) {
-                        if (!(bd->options & NAND_BBT_SCANEMPTY)) {
-                                size_t retlen;
-
-                                /* Read the full oob until read_oob is fixed to
-                                 * handle single byte reads for 16 bit buswidth */
-                                ret = mtd->read_oob(mtd, from + j * mtd->oobblock,
-                                                        mtd->oobsize, &retlen, buf);
-                                if (ret)
-                                        return ret;
-
-                                if (check_short_pattern (buf, bd)) {
-                                        this->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                                        printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
-                                                i >> 1, (unsigned int) from);
-                                        break;
-                                }
-                        } else {
-                                if (check_pattern (&buf[j * scanlen], scanlen, mtd->oobblock, bd)) {
-                                        this->bbt[i >> 3] |= 0x03 << (i & 0x6);
-                                        printk (KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
-                                                i >> 1, (unsigned int) from);
-                                        break;
-                                }
-                        }
+                if (bd->options & NAND_BBT_SCANALLPAGES)
+                        ret = scan_block_full(mtd, bd, from, buf, readlen,
+                                              scanlen, len);
+                else
+                        ret = scan_block_fast(mtd, bd, from, buf, len);
+
+                if (ret < 0)
+                        return ret;
+
+                if (ret) {
+                        this->bbt[i >> 3] |= 0x03 << (i & 0x6);
+                        printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
+                               i >> 1, (unsigned int)from);
+                        mtd->ecc_stats.badblocks++;
                 }
+
                 i += 2;
                 from += (1 << this->bbt_erase_shift);
         }
@@ -374,22 +454,23 @@ static int create_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
  * block.
  * If the option NAND_BBT_PERCHIP is given, each chip is searched
  * for a bbt, which contains the bad block information of this chip.
- * This is neccecary to provide support for certain DOC devices.
+ * This is necessary to provide support for certain DOC devices.
  *
  * The bbt ident pattern resides in the oob area of the first page
  * in a block.
  */
-static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td)
+static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *td)
 {
         struct nand_chip *this = mtd->priv;
         int i, chips;
         int bits, startblock, block, dir;
-        int scanlen = mtd->oobblock + mtd->oobsize;
+        int scanlen = mtd->writesize + mtd->oobsize;
         int bbtblocks;
+        int blocktopage = this->bbt_erase_shift - this->page_shift;
 
         /* Search direction top -> down ? */
         if (td->options & NAND_BBT_LASTBLOCK) {
-                startblock = (mtd->size >> this->bbt_erase_shift) -1;
+                startblock = (mtd->size >> this->bbt_erase_shift) - 1;
                 dir = -1;
         } else {
                 startblock = 0;
@@ -415,13 +496,16 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                 td->pages[i] = -1;
                 /* Scan the maximum number of blocks */
                 for (block = 0; block < td->maxblocks; block++) {
+
                         int actblock = startblock + dir * block;
+                        loff_t offs = actblock << this->bbt_erase_shift;
+
                         /* Read first page */
-                        nand_read_raw (mtd, buf, actblock << this->bbt_erase_shift, mtd->oobblock, mtd->oobsize);
-                        if (!check_pattern(buf, scanlen, mtd->oobblock, td)) {
-                                td->pages[i] = actblock << (this->bbt_erase_shift - this->page_shift);
+                        scan_read_raw(mtd, buf, offs, mtd->writesize);
+                        if (!check_pattern(buf, scanlen, mtd->writesize, td)) {
+                                td->pages[i] = actblock << blocktopage;
                                 if (td->options & NAND_BBT_VERSION) {
-                                        td->version[i] = buf[mtd->oobblock + td->veroffs];
+                                        td->version[i] = buf[mtd->writesize + td->veroffs];
                                 }
                                 break;
                         }
@@ -431,9 +515,10 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
         /* Check, if we found a bbt for each requested chip */
         for (i = 0; i < chips; i++) {
                 if (td->pages[i] == -1)
-                        printk (KERN_WARNING "Bad block table not found for chip %d\n", i);
+                        printk(KERN_WARNING "Bad block table not found for chip %d\n", i);
                 else
-                        printk (KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td->pages[i], td->version[i]);
+                        printk(KERN_DEBUG "Bad block table found at page %d, version 0x%02X\n", td->pages[i],
+                               td->version[i]);
         }
         return 0;
 }
@@ -447,21 +532,19 @@ static int search_bbt (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
  *
  * Search and read the bad block table(s)
 */
-static int search_read_bbts (struct mtd_info *mtd, uint8_t *buf,
-        struct nand_bbt_descr *td, struct nand_bbt_descr *md)
+static int search_read_bbts(struct mtd_info *mtd, uint8_t * buf, struct nand_bbt_descr *td, struct nand_bbt_descr *md)
 {
         /* Search the primary table */
-        search_bbt (mtd, buf, td);
+        search_bbt(mtd, buf, td);
 
         /* Search the mirror table */
         if (md)
-                search_bbt (mtd, buf, md);
+                search_bbt(mtd, buf, md);
 
         /* Force result check */
         return 1;
 }
 
-
 /**
  * write_bbt - [GENERIC] (Re)write the bad block table
  *
@@ -474,25 +557,31 @@ static int search_read_bbts (struct mtd_info *mtd, uint8_t *buf,
  * (Re)write the bad block table
  *
 */
-static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
-        struct nand_bbt_descr *td, struct nand_bbt_descr *md, int chipsel)
+static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
+                     struct nand_bbt_descr *td, struct nand_bbt_descr *md,
+                     int chipsel)
 {
         struct nand_chip *this = mtd->priv;
-        struct nand_oobinfo oobinfo;
         struct erase_info einfo;
         int i, j, res, chip = 0;
         int bits, startblock, dir, page, offs, numblocks, sft, sftmsk;
-        int nrchips, bbtoffs, pageoffs;
+        int nrchips, bbtoffs, pageoffs, ooboffs;
         uint8_t msk[4];
         uint8_t rcode = td->reserved_block_code;
         size_t retlen, len = 0;
         loff_t to;
+        struct mtd_oob_ops ops;
+
+        ops.ooblen = mtd->oobsize;
+        ops.ooboffs = 0;
+        ops.datbuf = NULL;
+        ops.mode = MTD_OOB_PLACE;
 
         if (!rcode)
                 rcode = 0xff;
         /* Write bad block table per chip rather than per device ? */
         if (td->options & NAND_BBT_PERCHIP) {
-                numblocks = (int) (this->chipsize >> this->bbt_erase_shift);
+                numblocks = (int)(this->chipsize >> this->bbt_erase_shift);
                 /* Full device write or specific chip ? */
                 if (chipsel == -1) {
                         nrchips = this->numchips;
@@ -501,7 +590,7 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
                         chip = chipsel;
                 }
         } else {
-                numblocks = (int) (mtd->size >> this->bbt_erase_shift);
+                numblocks = (int)(mtd->size >> this->bbt_erase_shift);
                 nrchips = 1;
         }
 
@@ -530,27 +619,38 @@ static int write_bbt (struct mtd_info *mtd, uint8_t *buf,
                 for (i = 0; i < td->maxblocks; i++) {
                         int block = startblock + dir * i;
                         /* Check, if the block is bad */
-                        switch ((this->bbt[block >> 2] >> (2 * (block & 0x03))) & 0x03) {
+                        switch ((this->bbt[block >> 2] >>
+                                 (2 * (block & 0x03))) & 0x03) {
                         case 0x01:
                         case 0x03:
                                 continue;
                         }
-                        page = block << (this->bbt_erase_shift - this->page_shift);
+                        page = block <<
+                                (this->bbt_erase_shift - this->page_shift);
                         /* Check, if the block is used by the mirror table */
                         if (!md || md->pages[chip] != page)
                                 goto write;
                 }
-                printk (KERN_ERR "No space left to write bad block table\n");
+                printk(KERN_ERR "No space left to write bad block table\n");
                 return -ENOSPC;
-write:
+        write:
 
                 /* Set up shift count and masks for the flash table */
                 bits = td->options & NAND_BBT_NRBITS_MSK;
+                msk[2] = ~rcode;
                 switch (bits) {
-                case 1: sft = 3; sftmsk = 0x07; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x01; break;
-                case 2: sft = 2; sftmsk = 0x06; msk[0] = 0x00; msk[1] = 0x01; msk[2] = ~rcode; msk[3] = 0x03; break;
-                case 4: sft = 1; sftmsk = 0x04; msk[0] = 0x00; msk[1] = 0x0C; msk[2] = ~rcode; msk[3] = 0x0f; break;
-                case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F; msk[2] = ~rcode; msk[3] = 0xff; break;
+                case 1: sft = 3; sftmsk = 0x07; msk[0] = 0x00; msk[1] = 0x01;
+                        msk[3] = 0x01;
+                        break;
+                case 2: sft = 2; sftmsk = 0x06; msk[0] = 0x00; msk[1] = 0x01;
+                        msk[3] = 0x03;
+                        break;
+                case 4: sft = 1; sftmsk = 0x04; msk[0] = 0x00; msk[1] = 0x0C;
+                        msk[3] = 0x0f;
+                        break;
+                case 8: sft = 0; sftmsk = 0x00; msk[0] = 0x00; msk[1] = 0x0F;
+                        msk[3] = 0xff;
+                        break;
                 default: return -EINVAL;
                 }
 
@@ -558,82 +658,92 @@ write:
 
                 to = ((loff_t) page) << this->page_shift;
 
-                memcpy (&oobinfo, this->autooob, sizeof(oobinfo));
-                oobinfo.useecc = MTD_NANDECC_PLACEONLY;
-
                 /* Must we save the block contents ? */
                 if (td->options & NAND_BBT_SAVECONTENT) {
                         /* Make it block aligned */
                         to &= ~((loff_t) ((1 << this->bbt_erase_shift) - 1));
                         len = 1 << this->bbt_erase_shift;
-                        res = mtd->read_ecc (mtd, to, len, &retlen, buf, &buf[len], &oobinfo);
+                        res = mtd->read(mtd, to, len, &retlen, buf);
                         if (res < 0) {
                                 if (retlen != len) {
-                                        printk (KERN_INFO "nand_bbt: Error reading block for writing the bad block table\n");
+                                        printk(KERN_INFO "nand_bbt: Error "
+                                               "reading block for writing "
+                                               "the bad block table\n");
                                         return res;
                                 }
-                                printk (KERN_WARNING "nand_bbt: ECC error while reading block for writing bad block table\n");
+                                printk(KERN_WARNING "nand_bbt: ECC error "
+                                       "while reading block for writing "
+                                       "bad block table\n");
                         }
+                        /* Read oob data */
+                        ops.len = (len >> this->page_shift) * mtd->oobsize;
+                        ops.oobbuf = &buf[len];
+                        res = mtd->read_oob(mtd, to + mtd->writesize, &ops);
+                        if (res < 0 || ops.retlen != ops.len)
+                                goto outerr;
+
                         /* Calc the byte offset in the buffer */
                         pageoffs = page - (int)(to >> this->page_shift);
                         offs = pageoffs << this->page_shift;
                         /* Preset the bbt area with 0xff */
-                        memset (&buf[offs], 0xff, (size_t)(numblocks >> sft));
-                        /* Preset the bbt's oob area with 0xff */
-                        memset (&buf[len + pageoffs * mtd->oobsize], 0xff,
-                                ((len >> this->page_shift) - pageoffs) * mtd->oobsize);
-                        if (td->options & NAND_BBT_VERSION) {
-                                buf[len + (pageoffs * mtd->oobsize) + td->veroffs] = td->version[chip];
-                        }
+                        memset(&buf[offs], 0xff, (size_t) (numblocks >> sft));
+                        ooboffs = len + (pageoffs * mtd->oobsize);
+
                 } else {
                         /* Calc length */
                         len = (size_t) (numblocks >> sft);
                         /* Make it page aligned ! */
-                        len = (len + (mtd->oobblock-1)) & ~(mtd->oobblock-1);
+                        len = (len + (mtd->writesize - 1)) &
+                                ~(mtd->writesize - 1);
                         /* Preset the buffer with 0xff */
-                        memset (buf, 0xff, len + (len >> this->page_shift) * mtd->oobsize);
+                        memset(buf, 0xff, len +
+                               (len >> this->page_shift)* mtd->oobsize);
                         offs = 0;
+                        ooboffs = len;
                         /* Pattern is located in oob area of first page */
-                        memcpy (&buf[len + td->offs], td->pattern, td->len);
-                        if (td->options & NAND_BBT_VERSION) {
-                                buf[len + td->veroffs] = td->version[chip];
-                        }
+                        memcpy(&buf[ooboffs + td->offs], td->pattern, td->len);
                 }
 
+                if (td->options & NAND_BBT_VERSION)
+                        buf[ooboffs + td->veroffs] = td->version[chip];
+
                 /* walk through the memory table */
-                for (i = 0; i < numblocks; ) {
+                for (i = 0; i < numblocks;) {
                         uint8_t dat;
                         dat = this->bbt[bbtoffs + (i >> 2)];
-                        for (j = 0; j < 4; j++ , i++) {
+                        for (j = 0; j < 4; j++, i++) {
                                 int sftcnt = (i << (3 - sft)) & sftmsk;
                                 /* Do not store the reserved bbt blocks ! */
-                                buf[offs + (i >> sft)] &= ~(msk[dat & 0x03] << sftcnt);
+                                buf[offs + (i >> sft)] &=
+                                        ~(msk[dat & 0x03] << sftcnt);
                                 dat >>= 2;
                         }
                 }
 
-                memset (&einfo, 0, sizeof (einfo));
+                memset(&einfo, 0, sizeof(einfo));
                 einfo.mtd = mtd;
-                einfo.addr = (unsigned long) to;
+                einfo.addr = (unsigned long)to;
                 einfo.len = 1 << this->bbt_erase_shift;
-                res = nand_erase_nand (mtd, &einfo, 1);
-                if (res < 0) {
-                        printk (KERN_WARNING "nand_bbt: Error during block erase: %d\n", res);
-                        return res;
-                }
+                res = nand_erase_nand(mtd, &einfo, 1);
+                if (res < 0)
+                        goto outerr;
 
-                res = mtd->write_ecc (mtd, to, len, &retlen, buf, &buf[len], &oobinfo);
-                if (res < 0) {
-                        printk (KERN_WARNING "nand_bbt: Error while writing bad block table %d\n", res);
-                        return res;
-                }
-                printk (KERN_DEBUG "Bad block table written to 0x%08x, version 0x%02X\n",
-                        (unsigned int) to, td->version[chip]);
+                res = scan_write_bbt(mtd, to, len, buf, &buf[len]);
+                if (res < 0)
+                        goto outerr;
+
+                printk(KERN_DEBUG "Bad block table written to 0x%08x, version "
+                       "0x%02X\n", (unsigned int)to, td->version[chip]);
 
                 /* Mark it as used */
                 td->pages[chip] = page;
         }
         return 0;
+
+ outerr:
+        printk(KERN_WARNING
+               "nand_bbt: Error while writing bad block table %d\n", res);
+        return res;
 }
 
 /**
@@ -644,27 +754,27 @@ write:
  * The function creates a memory based bbt by scanning the device
  * for manufacturer / software marked good / bad blocks
 */
-static inline int nand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
+static inline int nand_memory_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
 {
         struct nand_chip *this = mtd->priv;
 
         bd->options &= ~NAND_BBT_SCANEMPTY;
-        return create_bbt (mtd, this->data_buf, bd, -1);
+        return create_bbt(mtd, this->buffers.databuf, bd, -1);
 }
 
 /**
- * check_create - [GENERIC] create and write bbt(s) if neccecary
+ * check_create - [GENERIC] create and write bbt(s) if necessary
  * @mtd:        MTD device structure
  * @buf:        temporary buffer
  * @bd:         descriptor for the good/bad block search pattern
  *
  * The function checks the results of the previous call to read_bbt
- * and creates / updates the bbt(s) if neccecary
- * Creation is neccecary if no bbt was found for the chip/device
- * Update is neccecary if one of the tables is missing or the
+ * and creates / updates the bbt(s) if necessary
+ * Creation is necessary if no bbt was found for the chip/device
+ * Update is necessary if one of the tables is missing or the
  * version nr. of one table is less than the other
 */
-static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd)
+static int check_create(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr *bd)
 {
         int i, chips, writeops, chipsel, res;
         struct nand_chip *this = mtd->priv;
@@ -732,35 +842,35 @@ static int check_create (struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_des
                         rd = td;
                         goto writecheck;
                 }
-create:
+        create:
                 /* Create the bad block table by scanning the device ? */
                 if (!(td->options & NAND_BBT_CREATE))
                         continue;
 
                 /* Create the table in memory by scanning the chip(s) */
-                create_bbt (mtd, buf, bd, chipsel);
+                create_bbt(mtd, buf, bd, chipsel);
 
                 td->version[i] = 1;
                 if (md)
                         md->version[i] = 1;
-writecheck:
+        writecheck:
                 /* read back first ? */
                 if (rd)
-                        read_abs_bbt (mtd, buf, rd, chipsel);
+                        read_abs_bbt(mtd, buf, rd, chipsel);
                 /* If they weren't versioned, read both. */
                 if (rd2)
-                        read_abs_bbt (mtd, buf, rd2, chipsel);
+                        read_abs_bbt(mtd, buf, rd2, chipsel);
 
                 /* Write the bad block table to the device ? */
                 if ((writeops & 0x01) && (td->options & NAND_BBT_WRITE)) {
-                        res = write_bbt (mtd, buf, td, md, chipsel);
+                        res = write_bbt(mtd, buf, td, md, chipsel);
                         if (res < 0)
                                 return res;
                 }
 
                 /* Write the mirror bad block table to the device ? */
                 if ((writeops & 0x02) && md && (md->options & NAND_BBT_WRITE)) {
-                        res = write_bbt (mtd, buf, md, td, chipsel);
+                        res = write_bbt(mtd, buf, md, td, chipsel);
                         if (res < 0)
                                 return res;
                 }
@@ -777,7 +887,7 @@ writecheck:
  * accidental erasures / writes. The regions are identified by
  * the mark 0x02.
 */
-static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
+static void mark_bbt_region(struct mtd_info *mtd, struct nand_bbt_descr *td)
 {
         struct nand_chip *this = mtd->priv;
         int i, j, chips, block, nrblocks, update;
@@ -795,7 +905,8 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
         for (i = 0; i < chips; i++) {
                 if ((td->options & NAND_BBT_ABSPAGE) ||
                     !(td->options & NAND_BBT_WRITE)) {
-                        if (td->pages[i] == -1) continue;
+                        if (td->pages[i] == -1)
+                                continue;
                         block = td->pages[i] >> (this->bbt_erase_shift - this->page_shift);
                         block <<= 1;
                         oldval = this->bbt[(block >> 3)];
@@ -815,7 +926,8 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
                         oldval = this->bbt[(block >> 3)];
                         newval = oldval | (0x2 << (block & 0x06));
                         this->bbt[(block >> 3)] = newval;
-                        if (oldval != newval) update = 1;
+                        if (oldval != newval)
+                                update = 1;
                         block += 2;
                 }
                 /* If we want reserved blocks to be recorded to flash, and some
@@ -840,7 +952,7 @@ static void mark_bbt_region (struct mtd_info *mtd, struct nand_bbt_descr *td)
  * by calling the nand_free_bbt function.
  *
 */
-int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
+int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
 {
         struct nand_chip *this = mtd->priv;
         int len, res = 0;
@@ -850,21 +962,21 @@ int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
 
         len = mtd->size >> (this->bbt_erase_shift + 2);
         /* Allocate memory (2bit per block) */
-        this->bbt = kmalloc (len, GFP_KERNEL);
+        this->bbt = kmalloc(len, GFP_KERNEL);
         if (!this->bbt) {
-                printk (KERN_ERR "nand_scan_bbt: Out of memory\n");
+                printk(KERN_ERR "nand_scan_bbt: Out of memory\n");
                 return -ENOMEM;
         }
         /* Clear the memory bad block table */
-        memset (this->bbt, 0x00, len);
+        memset(this->bbt, 0x00, len);
 
         /* If no primary table decriptor is given, scan the device
          * to build a memory based bad block table
          */
         if (!td) {
                 if ((res = nand_memory_bbt(mtd, bd))) {
-                        printk (KERN_ERR "nand_bbt: Can't scan flash and build the RAM-based BBT\n");
-                        kfree (this->bbt);
+                        printk(KERN_ERR "nand_bbt: Can't scan flash and build the RAM-based BBT\n");
+                        kfree(this->bbt);
                         this->bbt = NULL;
                 }
                 return res;
@@ -873,35 +985,34 @@ int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
         /* Allocate a temporary buffer for one eraseblock incl. oob */
         len = (1 << this->bbt_erase_shift);
         len += (len >> this->page_shift) * mtd->oobsize;
-        buf = kmalloc (len, GFP_KERNEL);
+        buf = vmalloc(len);
         if (!buf) {
-                printk (KERN_ERR "nand_bbt: Out of memory\n");
-                kfree (this->bbt);
+                printk(KERN_ERR "nand_bbt: Out of memory\n");
+                kfree(this->bbt);
                 this->bbt = NULL;
                 return -ENOMEM;
         }
 
         /* Is the bbt at a given page ? */
         if (td->options & NAND_BBT_ABSPAGE) {
-                res = read_abs_bbts (mtd, buf, td, md);
+                res = read_abs_bbts(mtd, buf, td, md);
         } else {
                 /* Search the bad block table using a pattern in oob */
-                res = search_read_bbts (mtd, buf, td, md);
+                res = search_read_bbts(mtd, buf, td, md);
         }
 
         if (res)
-                res = check_create (mtd, buf, bd);
+                res = check_create(mtd, buf, bd);
 
         /* Prevent the bbt regions from erasing / writing */
-        mark_bbt_region (mtd, td);
+        mark_bbt_region(mtd, td);
         if (md)
-                mark_bbt_region (mtd, md);
+                mark_bbt_region(mtd, md);
 
-        kfree (buf);
+        vfree(buf);
         return res;
 }
 
-
 /**
  * nand_update_bbt - [NAND Interface] update bad block table(s)
  * @mtd:        MTD device structure
@@ -909,7 +1020,7 @@ int nand_scan_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
  *
  * The function updates the bad block table(s)
 */
-int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
+int nand_update_bbt(struct mtd_info *mtd, loff_t offs)
 {
         struct nand_chip *this = mtd->priv;
         int len, res = 0, writeops = 0;
@@ -925,9 +1036,9 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
         /* Allocate a temporary buffer for one eraseblock incl. oob */
         len = (1 << this->bbt_erase_shift);
         len += (len >> this->page_shift) * mtd->oobsize;
-        buf = kmalloc (len, GFP_KERNEL);
+        buf = kmalloc(len, GFP_KERNEL);
         if (!buf) {
-                printk (KERN_ERR "nand_update_bbt: Out of memory\n");
+                printk(KERN_ERR "nand_update_bbt: Out of memory\n");
                 return -ENOMEM;
         }
 
@@ -935,7 +1046,7 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
 
         /* Do we have a bbt per chip ? */
         if (td->options & NAND_BBT_PERCHIP) {
-                chip = (int) (offs >> this->chip_shift);
+                chip = (int)(offs >> this->chip_shift);
                 chipsel = chip;
         } else {
                 chip = 0;
@@ -948,17 +1059,17 @@ int nand_update_bbt (struct mtd_info *mtd, loff_t offs)
 
         /* Write the bad block table to the device ? */
         if ((writeops & 0x01) && (td->options & NAND_BBT_WRITE)) {
-                res = write_bbt (mtd, buf, td, md, chipsel);
+                res = write_bbt(mtd, buf, td, md, chipsel);
                 if (res < 0)
                         goto out;
         }
         /* Write the mirror bad block table to the device ? */
         if ((writeops & 0x02) && md && (md->options & NAND_BBT_WRITE)) {
-                res = write_bbt (mtd, buf, md, td, chipsel);
+                res = write_bbt(mtd, buf, md, td, chipsel);
         }
 
-out:
-        kfree (buf);
+ out:
+        kfree(buf);
         return res;
 }
 
@@ -981,14 +1092,14 @@ static struct nand_bbt_descr largepage_memorybased = {
 };
 
 static struct nand_bbt_descr smallpage_flashbased = {
-        .options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,
+        .options = NAND_BBT_SCAN2NDPAGE,
         .offs = 5,
         .len = 1,
         .pattern = scan_ff_pattern
 };
 
 static struct nand_bbt_descr largepage_flashbased = {
-        .options = NAND_BBT_SCANEMPTY | NAND_BBT_SCANALLPAGES,
+        .options = NAND_BBT_SCAN2NDPAGE,
         .offs = 0,
         .len = 2,
         .pattern = scan_ff_pattern
@@ -1036,7 +1147,7 @@ static struct nand_bbt_descr bbt_mirror_descr = {
  * support for the device and calls the nand_scan_bbt function
  *
 */
-int nand_default_bbt (struct mtd_info *mtd)
+int nand_default_bbt(struct mtd_info *mtd)
 {
         struct nand_chip *this = mtd->priv;
 
@@ -1046,7 +1157,7 @@ int nand_default_bbt (struct mtd_info *mtd)
          * of the good / bad information, so we _must_ store
          * this information in a good / bad table during
          * startup
-        */
+         */
         if (this->options & NAND_IS_AND) {
                 /* Use the default pattern descriptors */
                 if (!this->bbt_td) {
@@ -1054,10 +1165,9 @@ int nand_default_bbt (struct mtd_info *mtd)
                         this->bbt_md = &bbt_mirror_descr;
                 }
                 this->options |= NAND_USE_FLASH_BBT;
-                return nand_scan_bbt (mtd, &agand_flashbased);
+                return nand_scan_bbt(mtd, &agand_flashbased);
         }
 
-
         /* Is a flash based bad block table requested ? */
         if (this->options & NAND_USE_FLASH_BBT) {
                 /* Use the default pattern descriptors */
@@ -1066,18 +1176,17 @@ int nand_default_bbt (struct mtd_info *mtd)
                         this->bbt_md = &bbt_mirror_descr;
                 }
                 if (!this->badblock_pattern) {
-                        this->badblock_pattern = (mtd->oobblock > 512) ?
-                                &largepage_flashbased : &smallpage_flashbased;
+                        this->badblock_pattern = (mtd->writesize > 512) ? &largepage_flashbased : &smallpage_flashbased;
                 }
         } else {
                 this->bbt_td = NULL;
                 this->bbt_md = NULL;
                 if (!this->badblock_pattern) {
-                        this->badblock_pattern = (mtd->oobblock > 512) ?
-                                &largepage_memorybased : &smallpage_memorybased;
+                        this->badblock_pattern = (mtd->writesize > 512) ?
+                            &largepage_memorybased : &smallpage_memorybased;
                 }
         }
-        return nand_scan_bbt (mtd, this->badblock_pattern);
+        return nand_scan_bbt(mtd, this->badblock_pattern);
 }
 
 /**
@@ -1087,26 +1196,29 @@ int nand_default_bbt (struct mtd_info *mtd)
  * @allowbbt:   allow access to bad block table region
  *
 */
-int nand_isbad_bbt (struct mtd_info *mtd, loff_t offs, int allowbbt)
+int nand_isbad_bbt(struct mtd_info *mtd, loff_t offs, int allowbbt)
 {
         struct nand_chip *this = mtd->priv;
         int block;
-        uint8_t res;
+        uint8_t res;
 
         /* Get block number * 2 */
-        block = (int) (offs >> (this->bbt_erase_shift - 1));
+        block = (int)(offs >> (this->bbt_erase_shift - 1));
         res = (this->bbt[block >> 3] >> (block & 0x06)) & 0x03;
 
-        DEBUG (MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n",
-                (unsigned int)offs, block >> 1, res);
+        DEBUG(MTD_DEBUG_LEVEL2, "nand_isbad_bbt(): bbt info for offs 0x%08x: (block %d) 0x%02x\n",
+              (unsigned int)offs, block >> 1, res);
 
         switch ((int)res) {
-        case 0x00:      return 0;
-        case 0x01:      return 1;
-        case 0x02:      return allowbbt ? 0 : 1;
+        case 0x00:
+                return 0;
+        case 0x01:
+                return 1;
+        case 0x02:
+                return allowbbt ? 0 : 1;
         }
         return 1;
 }
 
-EXPORT_SYMBOL (nand_scan_bbt);
-EXPORT_SYMBOL (nand_default_bbt);
+EXPORT_SYMBOL(nand_scan_bbt);
+EXPORT_SYMBOL(nand_default_bbt);
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index 40ac909150a3..2a163e4084df 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -7,6 +7,8 @@
  * Copyright (C) 2000-2004 Steven J. Hill (sjhill@realitydiluted.com)
  *                         Toshiba America Electronics Components, Inc.
  *
+ * Copyright (C) 2006 Thomas Gleixner <tglx@linutronix.de>
+ *
  * $Id: nand_ecc.c,v 1.15 2005/11/07 11:14:30 gleixner Exp $
  *
  * This file is free software; you can redistribute it and/or modify it
@@ -62,90 +64,76 @@ static const u_char nand_ecc_precalc_table[] = {
         0x00, 0x55, 0x56, 0x03, 0x59, 0x0c, 0x0f, 0x5a, 0x5a, 0x0f, 0x0c, 0x59, 0x03, 0x56, 0x55, 0x00
 };
 
-
 /**
- * nand_trans_result - [GENERIC] create non-inverted ECC
- * @reg2:       line parity reg 2
- * @reg3:       line parity reg 3
- * @ecc_code:   ecc
- *
- * Creates non-inverted ECC code from line parity
- */
-static void nand_trans_result(u_char reg2, u_char reg3,
-        u_char *ecc_code)
-{
-        u_char a, b, i, tmp1, tmp2;
-
-        /* Initialize variables */
-        a = b = 0x80;
-        tmp1 = tmp2 = 0;
-
-        /* Calculate first ECC byte */
-        for (i = 0; i < 4; i++) {
-                if (reg3 & a)           /* LP15,13,11,9 --> ecc_code[0] */
-                        tmp1 |= b;
-                b >>= 1;
-                if (reg2 & a)           /* LP14,12,10,8 --> ecc_code[0] */
-                        tmp1 |= b;
-                b >>= 1;
-                a >>= 1;
-        }
-
-        /* Calculate second ECC byte */
-        b = 0x80;
-        for (i = 0; i < 4; i++) {
-                if (reg3 & a)           /* LP7,5,3,1 --> ecc_code[1] */
-                        tmp2 |= b;
-                b >>= 1;
-                if (reg2 & a)           /* LP6,4,2,0 --> ecc_code[1] */
-                        tmp2 |= b;
-                b >>= 1;
-                a >>= 1;
-        }
-
-        /* Store two of the ECC bytes */
-        ecc_code[0] = tmp1;
-        ecc_code[1] = tmp2;
-}
-
-/**
- * nand_calculate_ecc - [NAND Interface] Calculate 3 byte ECC code for 256 byte block
+ * nand_calculate_ecc - [NAND Interface] Calculate 3 byte ECC code
+ *                      for 256 byte block
  * @mtd:        MTD block structure
  * @dat:        raw data
  * @ecc_code:   buffer for ECC
  */
-int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
+int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
+                       u_char *ecc_code)
 {
-        u_char idx, reg1, reg2, reg3;
-        int j;
+        uint8_t idx, reg1, reg2, reg3, tmp1, tmp2;
+        int i;
 
         /* Initialize variables */
         reg1 = reg2 = reg3 = 0;
-        ecc_code[0] = ecc_code[1] = ecc_code[2] = 0;
 
         /* Build up column parity */
-        for(j = 0; j < 256; j++) {
-
+        for(i = 0; i < 256; i++) {
                 /* Get CP0 - CP5 from table */
-                idx = nand_ecc_precalc_table[dat[j]];
+                idx = nand_ecc_precalc_table[*dat++];
                 reg1 ^= (idx & 0x3f);
 
                 /* All bit XOR = 1 ? */
                 if (idx & 0x40) {
-                        reg3 ^= (u_char) j;
-                        reg2 ^= ~((u_char) j);
+                        reg3 ^= (uint8_t) i;
+                        reg2 ^= ~((uint8_t) i);
                 }
         }
 
         /* Create non-inverted ECC code from line parity */
-        nand_trans_result(reg2, reg3, ecc_code);
+        tmp1  = (reg3 & 0x80) >> 0; /* B7 -> B7 */
+        tmp1 |= (reg2 & 0x80) >> 1; /* B7 -> B6 */
+        tmp1 |= (reg3 & 0x40) >> 1; /* B6 -> B5 */
+        tmp1 |= (reg2 & 0x40) >> 2; /* B6 -> B4 */
+        tmp1 |= (reg3 & 0x20) >> 2; /* B5 -> B3 */
+        tmp1 |= (reg2 & 0x20) >> 3; /* B5 -> B2 */
+        tmp1 |= (reg3 & 0x10) >> 3; /* B4 -> B1 */
+        tmp1 |= (reg2 & 0x10) >> 4; /* B4 -> B0 */
+
+        tmp2  = (reg3 & 0x08) << 4; /* B3 -> B7 */
+        tmp2 |= (reg2 & 0x08) << 3; /* B3 -> B6 */
+        tmp2 |= (reg3 & 0x04) << 3; /* B2 -> B5 */
+        tmp2 |= (reg2 & 0x04) << 2; /* B2 -> B4 */
+        tmp2 |= (reg3 & 0x02) << 2; /* B1 -> B3 */
+        tmp2 |= (reg2 & 0x02) << 1; /* B1 -> B2 */
+        tmp2 |= (reg3 & 0x01) << 1; /* B0 -> B1 */
+        tmp2 |= (reg2 & 0x01) << 0; /* B7 -> B0 */
 
         /* Calculate final ECC code */
-        ecc_code[0] = ~ecc_code[0];
-        ecc_code[1] = ~ecc_code[1];
+#ifdef CONFIG_NAND_ECC_SMC
+        ecc_code[0] = ~tmp2;
+        ecc_code[1] = ~tmp1;
+#else
+        ecc_code[0] = ~tmp1;
+        ecc_code[1] = ~tmp2;
+#endif
         ecc_code[2] = ((~reg1) << 2) | 0x03;
+
         return 0;
 }
+EXPORT_SYMBOL(nand_calculate_ecc);
+
+static inline int countbits(uint32_t byte)
+{
+        int res = 0;
+
+        for (;byte; byte >>= 1)
+                res += byte & 0x01;
+        return res;
+}
 
 /**
  * nand_correct_data - [NAND Interface] Detect and correct bit error(s)
@@ -156,93 +144,54 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code
  *
  * Detect and correct a 1 bit error for 256 byte block
  */
-int nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)
+int nand_correct_data(struct mtd_info *mtd, u_char *dat,
+                      u_char *read_ecc, u_char *calc_ecc)
 {
-        u_char a, b, c, d1, d2, d3, add, bit, i;
+        uint8_t s0, s1, s2;
+
+#ifdef CONFIG_NAND_ECC_SMC
+        s0 = calc_ecc[0] ^ read_ecc[0];
+        s1 = calc_ecc[1] ^ read_ecc[1];
+        s2 = calc_ecc[2] ^ read_ecc[2];
+#else
+        s1 = calc_ecc[0] ^ read_ecc[0];
+        s0 = calc_ecc[1] ^ read_ecc[1];
+        s2 = calc_ecc[2] ^ read_ecc[2];
+#endif
+        if ((s0 | s1 | s2) == 0)
+                return 0;
 
-        /* Do error detection */
-        d1 = calc_ecc[0] ^ read_ecc[0];
-        d2 = calc_ecc[1] ^ read_ecc[1];
-        d3 = calc_ecc[2] ^ read_ecc[2];
+        /* Check for a single bit error */
+        if( ((s0 ^ (s0 >> 1)) & 0x55) == 0x55 &&
+            ((s1 ^ (s1 >> 1)) & 0x55) == 0x55 &&
+            ((s2 ^ (s2 >> 1)) & 0x54) == 0x54) {
 
-        if ((d1 | d2 | d3) == 0) {
-                /* No errors */
-                return 0;
-        }
-        else {
-                a = (d1 ^ (d1 >> 1)) & 0x55;
-                b = (d2 ^ (d2 >> 1)) & 0x55;
-                c = (d3 ^ (d3 >> 1)) & 0x54;
-
-                /* Found and will correct single bit error in the data */
-                if ((a == 0x55) && (b == 0x55) && (c == 0x54)) {
-                        c = 0x80;
-                        add = 0;
-                        a = 0x80;
-                        for (i=0; i<4; i++) {
-                                if (d1 & c)
-                                        add |= a;
-                                c >>= 2;
-                                a >>= 1;
-                        }
-                        c = 0x80;
-                        for (i=0; i<4; i++) {
-                                if (d2 & c)
-                                        add |= a;
-                                c >>= 2;
-                                a >>= 1;
-                        }
-                        bit = 0;
-                        b = 0x04;
-                        c = 0x80;
-                        for (i=0; i<3; i++) {
-                                if (d3 & c)
-                                        bit |= b;
-                                c >>= 2;
-                                b >>= 1;
-                        }
-                        b = 0x01;
-                        a = dat[add];
-                        a ^= (b << bit);
-                        dat[add] = a;
-                        return 1;
-                }
-                else {
-                        i = 0;
-                        while (d1) {
-                                if (d1 & 0x01)
-                                        ++i;
-                                d1 >>= 1;
-                        }
-                        while (d2) {
-                                if (d2 & 0x01)
-                                        ++i;
-                                d2 >>= 1;
-                        }
-                        while (d3) {
-                                if (d3 & 0x01)
-                                        ++i;
-                                d3 >>= 1;
-                        }
-                        if (i == 1) {
-                                /* ECC Code Error Correction */
-                                read_ecc[0] = calc_ecc[0];
-                                read_ecc[1] = calc_ecc[1];
-                                read_ecc[2] = calc_ecc[2];
-                                return 2;
-                        }
-                        else {
-                                /* Uncorrectable Error */
-                                return -1;
-                        }
-                }
+                uint32_t byteoffs, bitnum;
+
+                byteoffs = (s1 << 0) & 0x80;
+                byteoffs |= (s1 << 1) & 0x40;
+                byteoffs |= (s1 << 2) & 0x20;
+                byteoffs |= (s1 << 3) & 0x10;
+
+                byteoffs |= (s0 >> 4) & 0x08;
+                byteoffs |= (s0 >> 3) & 0x04;
+                byteoffs |= (s0 >> 2) & 0x02;
+                byteoffs |= (s0 >> 1) & 0x01;
+
+                bitnum = (s2 >> 5) & 0x04;
+                bitnum |= (s2 >> 4) & 0x02;
+                bitnum |= (s2 >> 3) & 0x01;
+
+                dat[byteoffs] ^= (1 << bitnum);
+
+                return 1;
         }
 
-        /* Should never happen */
+        if(countbits(s0 | ((uint32_t)s1 << 8) | ((uint32_t)s2 <<16)) == 1)
+                return 1;
+
         return -1;
 }
-
-EXPORT_SYMBOL(nand_calculate_ecc);
 EXPORT_SYMBOL(nand_correct_data);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index dbc7e55a4247..2e2cdf2fc91d 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -18,99 +18,110 @@
 *       Name. ID code, pagesize, chipsize in MegaByte, eraseblock size,
 *       options
 *
-*       Pagesize; 0, 256, 512
-*       0       get this information from the extended chip ID
+*       Pagesize; 0, 256, 512
+*       0       get this information from the extended chip ID
 +       256     256 Byte page size
 *       512     512 Byte page size
 */
 struct nand_flash_dev nand_flash_ids[] = {
-        {"NAND 1MiB 5V 8-bit",          0x6e, 256, 1, 0x1000, 0},
-        {"NAND 2MiB 5V 8-bit",          0x64, 256, 2, 0x1000, 0},
-        {"NAND 4MiB 5V 8-bit",          0x6b, 512, 4, 0x2000, 0},
-        {"NAND 1MiB 3,3V 8-bit",        0xe8, 256, 1, 0x1000, 0},
-        {"NAND 1MiB 3,3V 8-bit",        0xec, 256, 1, 0x1000, 0},
-        {"NAND 2MiB 3,3V 8-bit",        0xea, 256, 2, 0x1000, 0},
-        {"NAND 4MiB 3,3V 8-bit",        0xd5, 512, 4, 0x2000, 0},
-        {"NAND 4MiB 3,3V 8-bit",        0xe3, 512, 4, 0x2000, 0},
-        {"NAND 4MiB 3,3V 8-bit",        0xe5, 512, 4, 0x2000, 0},
-        {"NAND 8MiB 3,3V 8-bit",        0xd6, 512, 8, 0x2000, 0},
-
-        {"NAND 8MiB 1,8V 8-bit",        0x39, 512, 8, 0x2000, 0},
-        {"NAND 8MiB 3,3V 8-bit",        0xe6, 512, 8, 0x2000, 0},
-        {"NAND 8MiB 1,8V 16-bit",       0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16},
-        {"NAND 8MiB 3,3V 16-bit",       0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16},
-
-        {"NAND 16MiB 1,8V 8-bit",       0x33, 512, 16, 0x4000, 0},
-        {"NAND 16MiB 3,3V 8-bit",       0x73, 512, 16, 0x4000, 0},
-        {"NAND 16MiB 1,8V 16-bit",      0x43, 512, 16, 0x4000, NAND_BUSWIDTH_16},
-        {"NAND 16MiB 3,3V 16-bit",      0x53, 512, 16, 0x4000, NAND_BUSWIDTH_16},
-
-        {"NAND 32MiB 1,8V 8-bit",       0x35, 512, 32, 0x4000, 0},
-        {"NAND 32MiB 3,3V 8-bit",       0x75, 512, 32, 0x4000, 0},
-        {"NAND 32MiB 1,8V 16-bit",      0x45, 512, 32, 0x4000, NAND_BUSWIDTH_16},
-        {"NAND 32MiB 3,3V 16-bit",      0x55, 512, 32, 0x4000, NAND_BUSWIDTH_16},
-
-        {"NAND 64MiB 1,8V 8-bit",       0x36, 512, 64, 0x4000, 0},
-        {"NAND 64MiB 3,3V 8-bit",       0x76, 512, 64, 0x4000, 0},
-        {"NAND 64MiB 1,8V 16-bit",      0x46, 512, 64, 0x4000, NAND_BUSWIDTH_16},
-        {"NAND 64MiB 3,3V 16-bit",      0x56, 512, 64, 0x4000, NAND_BUSWIDTH_16},
-
-        {"NAND 128MiB 1,8V 8-bit",      0x78, 512, 128, 0x4000, 0},
-        {"NAND 128MiB 1,8V 8-bit",      0x39, 512, 128, 0x4000, 0},
-        {"NAND 128MiB 3,3V 8-bit",      0x79, 512, 128, 0x4000, 0},
-        {"NAND 128MiB 1,8V 16-bit",     0x72, 512, 128, 0x4000, NAND_BUSWIDTH_16},
-        {"NAND 128MiB 1,8V 16-bit",     0x49, 512, 128, 0x4000, NAND_BUSWIDTH_16},
-        {"NAND 128MiB 3,3V 16-bit",     0x74, 512, 128, 0x4000, NAND_BUSWIDTH_16},
-        {"NAND 128MiB 3,3V 16-bit",     0x59, 512, 128, 0x4000, NAND_BUSWIDTH_16},
-
-        {"NAND 256MiB 3,3V 8-bit",      0x71, 512, 256, 0x4000, 0},
-
-        /* These are the new chips with large page size. The pagesize
-        * and the erasesize is determined from the extended id bytes
-        */
+        {"NAND 1MiB 5V 8-bit",          0x6e, 256, 1, 0x1000, 0},
+        {"NAND 2MiB 5V 8-bit",          0x64, 256, 2, 0x1000, 0},
+        {"NAND 4MiB 5V 8-bit",          0x6b, 512, 4, 0x2000, 0},
+        {"NAND 1MiB 3,3V 8-bit",        0xe8, 256, 1, 0x1000, 0},
+        {"NAND 1MiB 3,3V 8-bit",        0xec, 256, 1, 0x1000, 0},
+        {"NAND 2MiB 3,3V 8-bit",        0xea, 256, 2, 0x1000, 0},
+        {"NAND 4MiB 3,3V 8-bit",        0xd5, 512, 4, 0x2000, 0},
+        {"NAND 4MiB 3,3V 8-bit",        0xe3, 512, 4, 0x2000, 0},
+        {"NAND 4MiB 3,3V 8-bit",        0xe5, 512, 4, 0x2000, 0},
+        {"NAND 8MiB 3,3V 8-bit",        0xd6, 512, 8, 0x2000, 0},
+
+        {"NAND 8MiB 1,8V 8-bit",        0x39, 512, 8, 0x2000, 0},
+        {"NAND 8MiB 3,3V 8-bit",        0xe6, 512, 8, 0x2000, 0},
+        {"NAND 8MiB 1,8V 16-bit",       0x49, 512, 8, 0x2000, NAND_BUSWIDTH_16},
+        {"NAND 8MiB 3,3V 16-bit",       0x59, 512, 8, 0x2000, NAND_BUSWIDTH_16},
+
+        {"NAND 16MiB 1,8V 8-bit",       0x33, 512, 16, 0x4000, 0},
+        {"NAND 16MiB 3,3V 8-bit",       0x73, 512, 16, 0x4000, 0},
+        {"NAND 16MiB 1,8V 16-bit",      0x43, 512, 16, 0x4000, NAND_BUSWIDTH_16},
+        {"NAND 16MiB 3,3V 16-bit",      0x53, 512, 16, 0x4000, NAND_BUSWIDTH_16},
+
+        {"NAND 32MiB 1,8V 8-bit",       0x35, 512, 32, 0x4000, 0},
+        {"NAND 32MiB 3,3V 8-bit",       0x75, 512, 32, 0x4000, 0},
+        {"NAND 32MiB 1,8V 16-bit",      0x45, 512, 32, 0x4000, NAND_BUSWIDTH_16},
+        {"NAND 32MiB 3,3V 16-bit",      0x55, 512, 32, 0x4000, NAND_BUSWIDTH_16},
+
+        {"NAND 64MiB 1,8V 8-bit",       0x36, 512, 64, 0x4000, 0},
+        {"NAND 64MiB 3,3V 8-bit",       0x76, 512, 64, 0x4000, 0},
+        {"NAND 64MiB 1,8V 16-bit",      0x46, 512, 64, 0x4000, NAND_BUSWIDTH_16},
+        {"NAND 64MiB 3,3V 16-bit",      0x56, 512, 64, 0x4000, NAND_BUSWIDTH_16},
+
+        {"NAND 128MiB 1,8V 8-bit",      0x78, 512, 128, 0x4000, 0},
+        {"NAND 128MiB 1,8V 8-bit",      0x39, 512, 128, 0x4000, 0},
+        {"NAND 128MiB 3,3V 8-bit",      0x79, 512, 128, 0x4000, 0},
+        {"NAND 128MiB 1,8V 16-bit",     0x72, 512, 128, 0x4000, NAND_BUSWIDTH_16},
+        {"NAND 128MiB 1,8V 16-bit",     0x49, 512, 128, 0x4000, NAND_BUSWIDTH_16},
+        {"NAND 128MiB 3,3V 16-bit",     0x74, 512, 128, 0x4000, NAND_BUSWIDTH_16},
+        {"NAND 128MiB 3,3V 16-bit",     0x59, 512, 128, 0x4000, NAND_BUSWIDTH_16},
+
+        {"NAND 256MiB 3,3V 8-bit",      0x71, 512, 256, 0x4000, 0},
+
+        /*
+         * These are the new chips with large page size. The pagesize and the
+         * erasesize is determined from the extended id bytes
+         */
+#define LP_OPTIONS (NAND_SAMSUNG_LP_OPTIONS | NAND_NO_READRDY | NAND_NO_AUTOINCR)
+#define LP_OPTIONS16 (LP_OPTIONS | NAND_BUSWIDTH_16)
+
         /*512 Megabit */
-        {"NAND 64MiB 1,8V 8-bit",       0xA2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 64MiB 3,3V 8-bit",       0xF2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 64MiB 1,8V 16-bit",      0xB2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        {"NAND 64MiB 3,3V 16-bit",      0xC2, 0,  64, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
+        {"NAND 64MiB 1,8V 8-bit",       0xA2, 0,  64, 0, LP_OPTIONS},
+        {"NAND 64MiB 3,3V 8-bit",       0xF2, 0,  64, 0, LP_OPTIONS},
+        {"NAND 64MiB 1,8V 16-bit",      0xB2, 0,  64, 0, LP_OPTIONS16},
+        {"NAND 64MiB 3,3V 16-bit",      0xC2, 0,  64, 0, LP_OPTIONS16},
 
         /* 1 Gigabit */
-        {"NAND 128MiB 1,8V 8-bit",      0xA1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 128MiB 3,3V 8-bit",      0xF1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 128MiB 1,8V 16-bit",     0xB1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        {"NAND 128MiB 3,3V 16-bit",     0xC1, 0, 128, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
+        {"NAND 128MiB 1,8V 8-bit",      0xA1, 0, 128, 0, LP_OPTIONS},
+        {"NAND 128MiB 3,3V 8-bit",      0xF1, 0, 128, 0, LP_OPTIONS},
+        {"NAND 128MiB 1,8V 16-bit",     0xB1, 0, 128, 0, LP_OPTIONS16},
+        {"NAND 128MiB 3,3V 16-bit",     0xC1, 0, 128, 0, LP_OPTIONS16},
 
         /* 2 Gigabit */
-        {"NAND 256MiB 1,8V 8-bit",      0xAA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 256MiB 3,3V 8-bit",      0xDA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 256MiB 1,8V 16-bit",     0xBA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        {"NAND 256MiB 3,3V 16-bit",     0xCA, 0, 256, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
+        {"NAND 256MiB 1,8V 8-bit",      0xAA, 0, 256, 0, LP_OPTIONS},
+        {"NAND 256MiB 3,3V 8-bit",      0xDA, 0, 256, 0, LP_OPTIONS},
+        {"NAND 256MiB 1,8V 16-bit",     0xBA, 0, 256, 0, LP_OPTIONS16},
+        {"NAND 256MiB 3,3V 16-bit",     0xCA, 0, 256, 0, LP_OPTIONS16},
 
         /* 4 Gigabit */
-        {"NAND 512MiB 1,8V 8-bit",      0xAC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 512MiB 3,3V 8-bit",      0xDC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 512MiB 1,8V 16-bit",     0xBC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        {"NAND 512MiB 3,3V 16-bit",     0xCC, 0, 512, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
+        {"NAND 512MiB 1,8V 8-bit",      0xAC, 0, 512, 0, LP_OPTIONS},
+        {"NAND 512MiB 3,3V 8-bit",      0xDC, 0, 512, 0, LP_OPTIONS},
+        {"NAND 512MiB 1,8V 16-bit",     0xBC, 0, 512, 0, LP_OPTIONS16},
+        {"NAND 512MiB 3,3V 16-bit",     0xCC, 0, 512, 0, LP_OPTIONS16},
 
         /* 8 Gigabit */
-        {"NAND 1GiB 1,8V 8-bit",        0xA3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 1GiB 3,3V 8-bit",        0xD3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 1GiB 1,8V 16-bit",       0xB3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        {"NAND 1GiB 3,3V 16-bit",       0xC3, 0, 1024, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
+        {"NAND 1GiB 1,8V 8-bit",        0xA3, 0, 1024, 0, LP_OPTIONS},
+        {"NAND 1GiB 3,3V 8-bit",        0xD3, 0, 1024, 0, LP_OPTIONS},
+        {"NAND 1GiB 1,8V 16-bit",       0xB3, 0, 1024, 0, LP_OPTIONS16},
+        {"NAND 1GiB 3,3V 16-bit",       0xC3, 0, 1024, 0, LP_OPTIONS16},
 
         /* 16 Gigabit */
-        {"NAND 2GiB 1,8V 8-bit",        0xA5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 2GiB 3,3V 8-bit",        0xD5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_NO_AUTOINCR},
-        {"NAND 2GiB 1,8V 16-bit",       0xB5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-        {"NAND 2GiB 3,3V 16-bit",       0xC5, 0, 2048, 0, NAND_SAMSUNG_LP_OPTIONS | NAND_BUSWIDTH_16 | NAND_NO_AUTOINCR},
-
-        /* Renesas AND 1 Gigabit. Those chips do not support extended id and have a strange page/block layout !
-         * The chosen minimum erasesize is 4 * 2 * 2048 = 16384 Byte, as those chips have an array of 4 page planes
-         * 1 block = 2 pages, but due to plane arrangement the blocks 0-3 consists of page 0 + 4,1 + 5, 2 + 6, 3 + 7
-         * Anyway JFFS2 would increase the eraseblock size so we chose a combined one which can be erased in one go
-         * There are more speed improvements for reads and writes possible, but not implemented now
+        {"NAND 2GiB 1,8V 8-bit",        0xA5, 0, 2048, 0, LP_OPTIONS},
+        {"NAND 2GiB 3,3V 8-bit",        0xD5, 0, 2048, 0, LP_OPTIONS},
+        {"NAND 2GiB 1,8V 16-bit",       0xB5, 0, 2048, 0, LP_OPTIONS16},
+        {"NAND 2GiB 3,3V 16-bit",       0xC5, 0, 2048, 0, LP_OPTIONS16},
+
+        /*
+         * Renesas AND 1 Gigabit. Those chips do not support extended id and
+         * have a strange page/block layout !  The chosen minimum erasesize is
+         * 4 * 2 * 2048 = 16384 Byte, as those chips have an array of 4 page
+         * planes 1 block = 2 pages, but due to plane arrangement the blocks
+         * 0-3 consists of page 0 + 4,1 + 5, 2 + 6, 3 + 7 Anyway JFFS2 would
+         * increase the eraseblock size so we chose a combined one which can be
+         * erased in one go There are more speed improvements for reads and
+         * writes possible, but not implemented now
          */
-        {"AND 128MiB 3,3V 8-bit",       0x01, 2048, 128, 0x4000, NAND_IS_AND | NAND_NO_AUTOINCR | NAND_4PAGE_ARRAY | BBT_AUTO_REFRESH},
+        {"AND 128MiB 3,3V 8-bit",       0x01, 2048, 128, 0x4000,
+         NAND_IS_AND | NAND_NO_AUTOINCR |NAND_NO_READRDY | NAND_4PAGE_ARRAY |
+         BBT_AUTO_REFRESH
+        },
 
         {NULL,}
 };
@@ -125,13 +136,13 @@ struct nand_manufacturers nand_manuf_ids[] = {
         {NAND_MFR_NATIONAL, "National"},
         {NAND_MFR_RENESAS, "Renesas"},
         {NAND_MFR_STMICRO, "ST Micro"},
-        {NAND_MFR_HYNIX, "Hynix"},
+        {NAND_MFR_HYNIX, "Hynix"},
         {0x0, "Unknown"}
 };
 
-EXPORT_SYMBOL (nand_manuf_ids);
-EXPORT_SYMBOL (nand_flash_ids);
+EXPORT_SYMBOL(nand_manuf_ids);
+EXPORT_SYMBOL(nand_flash_ids);
 
-MODULE_LICENSE ("GPL");
-MODULE_AUTHOR ("Thomas Gleixner <tglx@linutronix.de>");
-MODULE_DESCRIPTION ("Nand device & manufacturer ID's");
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>");
+MODULE_DESCRIPTION("Nand device & manufacturer IDs");
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index a0af92cc7efd..ebd64abc8be8 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -369,7 +369,7 @@ init_nandsim(struct mtd_info *mtd)
         /* Initialize the NAND flash parameters */
         ns->busw = chip->options & NAND_BUSWIDTH_16 ? 16 : 8;
         ns->geom.totsz    = mtd->size;
-        ns->geom.pgsz     = mtd->oobblock;
+        ns->geom.pgsz     = mtd->writesize;
         ns->geom.oobsz    = mtd->oobsize;
         ns->geom.secsz    = mtd->erasesize;
         ns->geom.pgszoob  = ns->geom.pgsz + ns->geom.oobsz;
@@ -1071,68 +1071,6 @@ switch_state(struct nandsim *ns)
         }
 }
 
-static void
-ns_hwcontrol(struct mtd_info *mtd, int cmd)
-{
-        struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
-
-        switch (cmd) {
-
-        /* set CLE line high */
-        case NAND_CTL_SETCLE:
-                NS_DBG("ns_hwcontrol: start command latch cycles\n");
-                ns->lines.cle  = 1;
-                break;
-
-        /* set CLE line low */
-        case NAND_CTL_CLRCLE:
-                NS_DBG("ns_hwcontrol: stop command latch cycles\n");
-                ns->lines.cle  = 0;
-                break;
-
-        /* set ALE line high */
-        case NAND_CTL_SETALE:
-                NS_DBG("ns_hwcontrol: start address latch cycles\n");
-                ns->lines.ale   = 1;
-                break;
-
-        /* set ALE line low */
-        case NAND_CTL_CLRALE:
-                NS_DBG("ns_hwcontrol: stop address latch cycles\n");
-                ns->lines.ale  = 0;
-                break;
-
-        /* set WP line high */
-        case NAND_CTL_SETWP:
-                NS_DBG("ns_hwcontrol: enable write protection\n");
-                ns->lines.wp = 1;
-                break;
-
-        /* set WP line low */
-        case NAND_CTL_CLRWP:
-                NS_DBG("ns_hwcontrol: disable write protection\n");
-                ns->lines.wp = 0;
-                break;
-
-        /* set CE line low */
-        case NAND_CTL_SETNCE:
-                NS_DBG("ns_hwcontrol: enable chip\n");
-                ns->lines.ce = 1;
-                break;
-
-        /* set CE line high */
-        case NAND_CTL_CLRNCE:
-                NS_DBG("ns_hwcontrol: disable chip\n");
-                ns->lines.ce = 0;
-                break;
-
-        default:
-                NS_ERR("hwcontrol: unknown command\n");
-        }
-
-        return;
-}
-
 static u_char
 ns_nand_read_byte(struct mtd_info *mtd)
 {
@@ -1359,6 +1297,18 @@ ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
         return;
 }
 
+static void ns_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int bitmask)
+{
+        struct nandsim *ns = ((struct nand_chip *)mtd->priv)->priv;
+
+        ns->lines.cle = bitmask & NAND_CLE ? 1 : 0;
+        ns->lines.ale = bitmask & NAND_ALE ? 1 : 0;
+        ns->lines.ce = bitmask & NAND_NCE ? 1 : 0;
+
+        if (cmd != NAND_CMD_NONE)
+                ns_nand_write_byte(mtd, cmd);
+}
+
 static int
 ns_device_ready(struct mtd_info *mtd)
 {
@@ -1377,17 +1327,6 @@ ns_nand_read_word(struct mtd_info *mtd)
 }
 
 static void
-ns_nand_write_word(struct mtd_info *mtd, uint16_t word)
-{
-        struct nand_chip *chip = (struct nand_chip *)mtd->priv;
-
-        NS_DBG("write_word\n");
-
-        chip->write_byte(mtd, word & 0xFF);
-        chip->write_byte(mtd, word >> 8);
-}
-
-static void
 ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
@@ -1514,16 +1453,14 @@ static int __init ns_init_module(void)
         /*
          * Register simulator's callbacks.
          */
-        chip->hwcontrol  = ns_hwcontrol;
+        chip->cmd_ctrl   = ns_hwcontrol;
         chip->read_byte  = ns_nand_read_byte;
         chip->dev_ready  = ns_device_ready;
-        chip->write_byte = ns_nand_write_byte;
         chip->write_buf  = ns_nand_write_buf;
         chip->read_buf   = ns_nand_read_buf;
         chip->verify_buf = ns_nand_verify_buf;
-        chip->write_word = ns_nand_write_word;
         chip->read_word  = ns_nand_read_word;
-        chip->eccmode    = NAND_ECC_SOFT;
+        chip->ecc.mode   = NAND_ECC_SOFT;
         chip->options   |= NAND_SKIP_BBTSCAN;
 
         /*
@@ -1546,6 +1483,8 @@ static int __init ns_init_module(void)
                 chip->options |= NAND_BUSWIDTH_16;
         }
 
+        nsmtd->owner = THIS_MODULE;
+
         if ((retval = nand_scan(nsmtd, 1)) != 0) {
                 NS_ERR("can't register NAND Simulator\n");
                 if (retval > 0)
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
new file mode 100644
index 000000000000..fe8d38514ba6
--- /dev/null
+++ b/drivers/mtd/nand/ndfc.c
@@ -0,0 +1,311 @@
+/*
+ *  drivers/mtd/ndfc.c
+ *
+ *  Overview:
+ *   Platform independend driver for NDFC (NanD Flash Controller)
+ *   integrated into EP440 cores
+ *
+ *  Author: Thomas Gleixner
+ *
+ *  Copyright 2006 IBM
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ */
+#include <linux/module.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/ndfc.h>
+#include <linux/mtd/mtd.h>
+#include <linux/platform_device.h>
+
+#include <asm/io.h>
+#include <asm/ibm44x.h>
+
+struct ndfc_nand_mtd {
+        struct mtd_info                 mtd;
+        struct nand_chip                chip;
+        struct platform_nand_chip       *pl_chip;
+};
+
+static struct ndfc_nand_mtd ndfc_mtd[NDFC_MAX_BANKS];
+
+struct ndfc_controller {
+        void __iomem            *ndfcbase;
+        struct nand_hw_control  ndfc_control;
+        atomic_t                childs_active;
+};
+
+static struct ndfc_controller ndfc_ctrl;
+
+static void ndfc_select_chip(struct mtd_info *mtd, int chip)
+{
+        uint32_t ccr;
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        struct nand_chip *nandchip = mtd->priv;
+        struct ndfc_nand_mtd *nandmtd = nandchip->priv;
+        struct platform_nand_chip *pchip = nandmtd->pl_chip;
+
+        ccr = __raw_readl(ndfc->ndfcbase + NDFC_CCR);
+        if (chip >= 0) {
+                ccr &= ~NDFC_CCR_BS_MASK;
+                ccr |= NDFC_CCR_BS(chip + pchip->chip_offset);
+        } else
+                ccr |= NDFC_CCR_RESET_CE;
+        writel(ccr, ndfc->ndfcbase + NDFC_CCR);
+}
+
+static void ndfc_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+        struct nand_chip *chip = mtd->priv;
+
+        if (cmd == NAND_CMD_NONE)
+                return;
+
+        if (ctrl & NAND_CLE)
+                writel(cmd & 0xFF, chip->IO_ADDR_W + NDFC_CMD);
+        else
+                writel(cmd & 0xFF, chip->IO_ADDR_W + NDFC_ALE);
+}
+
+static int ndfc_ready(struct mtd_info *mtd)
+{
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+
+        return __raw_readl(ndfc->ndfcbase + NDFC_STAT) & NDFC_STAT_IS_READY;
+}
+
+static void ndfc_enable_hwecc(struct mtd_info *mtd, int mode)
+{
+        uint32_t ccr;
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+
+        ccr = __raw_readl(ndfc->ndfcbase + NDFC_CCR);
+        ccr |= NDFC_CCR_RESET_ECC;
+        __raw_writel(ccr, ndfc->ndfcbase + NDFC_CCR);
+        wmb();
+}
+
+static int ndfc_calculate_ecc(struct mtd_info *mtd,
+                              const u_char *dat, u_char *ecc_code)
+{
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        uint32_t ecc;
+        uint8_t *p = (uint8_t *)&ecc;
+
+        wmb();
+        ecc = __raw_readl(ndfc->ndfcbase + NDFC_ECC);
+        ecc_code[0] = p[1];
+        ecc_code[1] = p[2];
+        ecc_code[2] = p[3];
+
+        return 0;
+}
+
+/*
+ * Speedups for buffer read/write/verify
+ *
+ * NDFC allows 32bit read/write of data. So we can speed up the buffer
+ * functions. No further checking, as nand_base will always read/write
+ * page aligned.
+ */
+static void ndfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
+{
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        uint32_t *p = (uint32_t *) buf;
+
+        for(;len > 0; len -= 4)
+                *p++ = __raw_readl(ndfc->ndfcbase + NDFC_DATA);
+}
+
+static void ndfc_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
+{
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        uint32_t *p = (uint32_t *) buf;
+
+        for(;len > 0; len -= 4)
+                __raw_writel(*p++, ndfc->ndfcbase + NDFC_DATA);
+}
+
+static int ndfc_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
+{
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        uint32_t *p = (uint32_t *) buf;
+
+        for(;len > 0; len -= 4)
+                if (*p++ != __raw_readl(ndfc->ndfcbase + NDFC_DATA))
+                        return -EFAULT;
+        return 0;
+}
+
+/*
+ * Initialize chip structure
+ */
+static void ndfc_chip_init(struct ndfc_nand_mtd *mtd)
+{
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        struct nand_chip *chip = &mtd->chip;
+
+        chip->IO_ADDR_R = ndfc->ndfcbase + NDFC_DATA;
+        chip->IO_ADDR_W = ndfc->ndfcbase + NDFC_DATA;
+        chip->cmd_ctrl = ndfc_hwcontrol;
+        chip->dev_ready = ndfc_ready;
+        chip->select_chip = ndfc_select_chip;
+        chip->chip_delay = 50;
+        chip->priv = mtd;
+        chip->options = mtd->pl_chip->options;
+        chip->controller = &ndfc->ndfc_control;
+        chip->read_buf = ndfc_read_buf;
+        chip->write_buf = ndfc_write_buf;
+        chip->verify_buf = ndfc_verify_buf;
+        chip->ecc.correct = nand_correct_data;
+        chip->ecc.hwctl = ndfc_enable_hwecc;
+        chip->ecc.calculate = ndfc_calculate_ecc;
+        chip->ecc.mode = NAND_ECC_HW;
+        chip->ecc.size = 256;
+        chip->ecc.bytes = 3;
+        chip->ecclayout = mtd->pl_chip->ecclayout;
+        mtd->mtd.priv = chip;
+        mtd->mtd.owner = THIS_MODULE;
+}
+
+static int ndfc_chip_probe(struct platform_device *pdev)
+{
+        struct platform_nand_chip *nc = pdev->dev.platform_data;
+        struct ndfc_chip_settings *settings = nc->priv;
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        struct ndfc_nand_mtd *nandmtd;
+
+        if (nc->chip_offset >= NDFC_MAX_BANKS || nc->nr_chips > NDFC_MAX_BANKS)
+                return -EINVAL;
+
+        /* Set the bank settings */
+        __raw_writel(settings->bank_settings,
+                     ndfc->ndfcbase + NDFC_BCFG0 + (nc->chip_offset << 2));
+
+        nandmtd = &ndfc_mtd[pdev->id];
+        if (nandmtd->pl_chip)
+                return -EBUSY;
+
+        nandmtd->pl_chip = nc;
+        ndfc_chip_init(nandmtd);
+
+        /* Scan for chips */
+        if (nand_scan(&nandmtd->mtd, nc->nr_chips)) {
+                nandmtd->pl_chip = NULL;
+                return -ENODEV;
+        }
+
+#ifdef CONFIG_MTD_PARTITIONS
+        printk("Number of partitions %d\n", nc->nr_partitions);
+        if (nc->nr_partitions) {
+                /* Add the full device, so complete dumps can be made */
+                add_mtd_device(&nandmtd->mtd);
+                add_mtd_partitions(&nandmtd->mtd, nc->partitions,
+                                   nc->nr_partitions);
+
+        } else
+#else
+                add_mtd_device(&nandmtd->mtd);
+#endif
+
+        atomic_inc(&ndfc->childs_active);
+        return 0;
+}
+
+static int ndfc_chip_remove(struct platform_device *pdev)
+{
+        return 0;
+}
+
+static int ndfc_nand_probe(struct platform_device *pdev)
+{
+        struct platform_nand_ctrl *nc = pdev->dev.platform_data;
+        struct ndfc_controller_settings *settings = nc->priv;
+        struct resource *res = pdev->resource;
+        struct ndfc_controller *ndfc = &ndfc_ctrl;
+        unsigned long long phys = settings->ndfc_erpn | res->start;
+
+        ndfc->ndfcbase = ioremap64(phys, res->end - res->start + 1);
+        if (!ndfc->ndfcbase) {
+                printk(KERN_ERR "NDFC: ioremap failed\n");
+                return -EIO;
+        }
+
+        __raw_writel(settings->ccr_settings, ndfc->ndfcbase + NDFC_CCR);
+
+        spin_lock_init(&ndfc->ndfc_control.lock);
+        init_waitqueue_head(&ndfc->ndfc_control.wq);
+
+        platform_set_drvdata(pdev, ndfc);
+
+        printk("NDFC NAND Driver initialized. Chip-Rev: 0x%08x\n",
+               __raw_readl(ndfc->ndfcbase + NDFC_REVID));
+
+        return 0;
+}
+
+static int ndfc_nand_remove(struct platform_device *pdev)
+{
+        struct ndfc_controller *ndfc = platform_get_drvdata(pdev);
+
+        if (atomic_read(&ndfc->childs_active))
+                return -EBUSY;
+
+        if (ndfc) {
+                platform_set_drvdata(pdev, NULL);
+                iounmap(ndfc_ctrl.ndfcbase);
+                ndfc_ctrl.ndfcbase = NULL;
+        }
+        return 0;
+}
+
+/* driver device registration */
+
+static struct platform_driver ndfc_chip_driver = {
+        .probe          = ndfc_chip_probe,
+        .remove         = ndfc_chip_remove,
+        .driver         = {
+                .name   = "ndfc-chip",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static struct platform_driver ndfc_nand_driver = {
+        .probe          = ndfc_nand_probe,
+        .remove         = ndfc_nand_remove,
+        .driver         = {
+                .name   = "ndfc-nand",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init ndfc_nand_init(void)
+{
+        int ret;
+
+        spin_lock_init(&ndfc_ctrl.ndfc_control.lock);
+        init_waitqueue_head(&ndfc_ctrl.ndfc_control.wq);
+
+        ret = platform_driver_register(&ndfc_nand_driver);
+        if (!ret)
+                ret = platform_driver_register(&ndfc_chip_driver);
+        return ret;
+}
+
+static void __exit ndfc_nand_exit(void)
+{
+        platform_driver_unregister(&ndfc_chip_driver);
+        platform_driver_unregister(&ndfc_nand_driver);
+}
+
+module_init(ndfc_nand_init);
+module_exit(ndfc_nand_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Thomas Gleixner <tglx@linutronix.de>");
+MODULE_DESCRIPTION("Platform driver for NDFC");
diff --git a/drivers/mtd/nand/ppchameleonevb.c b/drivers/mtd/nand/ppchameleonevb.c
index 91a95f34a6ee..22fa65c12ab9 100644
--- a/drivers/mtd/nand/ppchameleonevb.c
+++ b/drivers/mtd/nand/ppchameleonevb.c
@@ -58,21 +58,21 @@
 /*
  * MTD structure for PPChameleonEVB board
  */
-static struct mtd_info *ppchameleon_mtd         = NULL;
+static struct mtd_info *ppchameleon_mtd = NULL;
 static struct mtd_info *ppchameleonevb_mtd = NULL;
 
 /*
  * Module stuff
  */
-static unsigned long ppchameleon_fio_pbase      = CFG_NAND0_PADDR;
+static unsigned long ppchameleon_fio_pbase = CFG_NAND0_PADDR;
 static unsigned long ppchameleonevb_fio_pbase = CFG_NAND1_PADDR;
 
 #ifdef MODULE
 module_param(ppchameleon_fio_pbase, ulong, 0);
 module_param(ppchameleonevb_fio_pbase, ulong, 0);
 #else
-__setup("ppchameleon_fio_pbase=",ppchameleon_fio_pbase);
-__setup("ppchameleonevb_fio_pbase=",ppchameleonevb_fio_pbase);
+__setup("ppchameleon_fio_pbase=", ppchameleon_fio_pbase);
+__setup("ppchameleonevb_fio_pbase=", ppchameleonevb_fio_pbase);
 #endif
 
 #ifdef CONFIG_MTD_PARTITIONS
@@ -80,82 +80,96 @@ __setup("ppchameleonevb_fio_pbase=",ppchameleonevb_fio_pbase);
  * Define static partitions for flash devices
  */
 static struct mtd_partition partition_info_hi[] = {
-        { name: "PPChameleon HI Nand Flash",
-                  offset: 0,
-                  size: 128*1024*1024 }
+      { .name = "PPChameleon HI Nand Flash",
+        offset = 0,
+        .size = 128 * 1024 * 1024
+      }
 };
 
 static struct mtd_partition partition_info_me[] = {
-        { name: "PPChameleon ME Nand Flash",
-                  offset: 0,
-                  size: 32*1024*1024 }
+      { .name = "PPChameleon ME Nand Flash",
+        .offset = 0,
+        .size = 32 * 1024 * 1024
+      }
 };
 
 static struct mtd_partition partition_info_evb[] = {
-        { name: "PPChameleonEVB Nand Flash",
-                  offset: 0,
-                  size: 32*1024*1024 }
+      { .name = "PPChameleonEVB Nand Flash",
+        .offset = 0,
+        .size = 32 * 1024 * 1024
+      }
 };
 
 #define NUM_PARTITIONS 1
 
-extern int parse_cmdline_partitions(struct mtd_info *master,
-                                    struct mtd_partition **pparts,
-                                    const char *mtd_id);
+extern int parse_cmdline_partitions(struct mtd_info *master, struct mtd_partition **pparts, const char *mtd_id);
 #endif
 
-
 /*
  *      hardware specific access to control-lines
  */
-static void ppchameleon_hwcontrol(struct mtd_info *mtdinfo, int cmd)
+static void ppchameleon_hwcontrol(struct mtd_info *mtdinfo, int cmd,
+                                  unsigned int ctrl)
 {
-        switch(cmd) {
-
-        case NAND_CTL_SETCLE:
-                MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND0_PADDR);
-                break;
-        case NAND_CTL_CLRCLE:
-                MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND0_PADDR);
-                break;
-        case NAND_CTL_SETALE:
-                MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND0_PADDR);
-                break;
-        case NAND_CTL_CLRALE:
-                MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND0_PADDR);
-                break;
-        case NAND_CTL_SETNCE:
+        struct nand_chip *chip = mtd->priv;
+
+        if (ctrl & NAND_CTRL_CHANGE) {
+#error Missing headerfiles. No way to fix this. -tglx
+                switch (cmd) {
+                case NAND_CTL_SETCLE:
+                        MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND0_PADDR);
+                        break;
+                case NAND_CTL_CLRCLE:
+                        MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND0_PADDR);
+                        break;
+                case NAND_CTL_SETALE:
+                        MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND0_PADDR);
+                        break;
+                case NAND_CTL_CLRALE:
+                        MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND0_PADDR);
+                        break;
+                case NAND_CTL_SETNCE:
                         MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND0_PADDR);
-                break;
-        case NAND_CTL_CLRNCE:
+                        break;
+                case NAND_CTL_CLRNCE:
                         MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND0_PADDR);
-                break;
+                        break;
+                }
         }
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
 }
 
-static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd)
+static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd,
+                                     unsigned int ctrl)
 {
-        switch(cmd) {
-
-        case NAND_CTL_SETCLE:
-                MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND1_PADDR);
-                break;
-        case NAND_CTL_CLRCLE:
-                MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND1_PADDR);
-                break;
-        case NAND_CTL_SETALE:
-                MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND1_PADDR);
-                break;
-        case NAND_CTL_CLRALE:
-                MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND1_PADDR);
-                break;
-        case NAND_CTL_SETNCE:
-                MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND1_PADDR);
-                break;
-        case NAND_CTL_CLRNCE:
-                MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND1_PADDR);
-                break;
+        struct nand_chip *chip = mtd->priv;
+
+        if (ctrl & NAND_CTRL_CHANGE) {
+#error Missing headerfiles. No way to fix this. -tglx
+                switch (cmd) {
+                case NAND_CTL_SETCLE:
+                        MACRO_NAND_CTL_SETCLE((unsigned long)CFG_NAND1_PADDR);
+                        break;
+                case NAND_CTL_CLRCLE:
+                        MACRO_NAND_CTL_CLRCLE((unsigned long)CFG_NAND1_PADDR);
+                        break;
+                case NAND_CTL_SETALE:
+                        MACRO_NAND_CTL_SETALE((unsigned long)CFG_NAND1_PADDR);
+                        break;
+                case NAND_CTL_CLRALE:
+                        MACRO_NAND_CTL_CLRALE((unsigned long)CFG_NAND1_PADDR);
+                        break;
+                case NAND_CTL_SETNCE:
+                        MACRO_NAND_ENABLE_CE((unsigned long)CFG_NAND1_PADDR);
+                        break;
+                case NAND_CTL_CLRNCE:
+                        MACRO_NAND_DISABLE_CE((unsigned long)CFG_NAND1_PADDR);
+                        break;
+                }
         }
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
 }
 
 #ifdef USE_READY_BUSY_PIN
@@ -164,15 +178,15 @@ static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd)
  */
 static int ppchameleon_device_ready(struct mtd_info *minfo)
 {
-        if (in_be32((volatile unsigned*)GPIO0_IR) & NAND_RB_GPIO_PIN)
+        if (in_be32((volatile unsigned *)GPIO0_IR) & NAND_RB_GPIO_PIN)
                 return 1;
         return 0;
 }
 
 static int ppchameleonevb_device_ready(struct mtd_info *minfo)
 {
-        if (in_be32((volatile unsigned*)GPIO0_IR) & NAND_EVB_RB_GPIO_PIN)
-        return 1;
+        if (in_be32((volatile unsigned *)GPIO0_IR) & NAND_EVB_RB_GPIO_PIN)
+                return 1;
         return 0;
 }
 #endif
@@ -185,7 +199,7 @@ const char *part_probes_evb[] = { "cmdlinepart", NULL };
 /*
  * Main initialization routine
  */
-static int __init ppchameleonevb_init (void)
+static int __init ppchameleonevb_init(void)
 {
         struct nand_chip *this;
         const char *part_type = 0;
@@ -194,13 +208,11 @@ static int __init ppchameleonevb_init (void)
         void __iomem *ppchameleon_fio_base;
         void __iomem *ppchameleonevb_fio_base;
 
-
         /*********************************
         * Processor module NAND (if any) *
         *********************************/
         /* Allocate memory for MTD device structure and private data */
-        ppchameleon_mtd = kmalloc(sizeof(struct mtd_info) +
-                                                      sizeof(struct nand_chip), GFP_KERNEL);
+        ppchameleon_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!ppchameleon_mtd) {
                 printk("Unable to allocate PPChameleon NAND MTD device structure.\n");
                 return -ENOMEM;
@@ -208,63 +220,65 @@ static int __init ppchameleonevb_init (void)
 
         /* map physical address */
         ppchameleon_fio_base = ioremap(ppchameleon_fio_pbase, SZ_4M);
-        if(!ppchameleon_fio_base) {
+        if (!ppchameleon_fio_base) {
                 printk("ioremap PPChameleon NAND flash failed\n");
                 kfree(ppchameleon_mtd);
                 return -EIO;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&ppchameleon_mtd[1]);
+        this = (struct nand_chip *)(&ppchameleon_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) ppchameleon_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(ppchameleon_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         ppchameleon_mtd->priv = this;
+        ppchameleon_mtd->owner = THIS_MODULE;
 
-        /* Initialize GPIOs */
+        /* Initialize GPIOs */
         /* Pin mapping for NAND chip */
         /*
-                CE      GPIO_01
-                CLE     GPIO_02
-                ALE     GPIO_03
-                R/B     GPIO_04
-        */
+           CE   GPIO_01
+           CLE  GPIO_02
+           ALE  GPIO_03
+           R/B  GPIO_04
+         */
         /* output select */
-        out_be32((volatile unsigned*)GPIO0_OSRH, in_be32((volatile unsigned*)GPIO0_OSRH) & 0xC0FFFFFF);
+        out_be32((volatile unsigned *)GPIO0_OSRH, in_be32((volatile unsigned *)GPIO0_OSRH) & 0xC0FFFFFF);
         /* three-state select */
-        out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) & 0xC0FFFFFF);
+        out_be32((volatile unsigned *)GPIO0_TSRH, in_be32((volatile unsigned *)GPIO0_TSRH) & 0xC0FFFFFF);
         /* enable output driver */
-        out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_nCE_GPIO_PIN | NAND_CLE_GPIO_PIN | NAND_ALE_GPIO_PIN);
+        out_be32((volatile unsigned *)GPIO0_TCR,
+                 in_be32((volatile unsigned *)GPIO0_TCR) | NAND_nCE_GPIO_PIN | NAND_CLE_GPIO_PIN | NAND_ALE_GPIO_PIN);
 #ifdef USE_READY_BUSY_PIN
         /* three-state select */
-        out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) & 0xFF3FFFFF);
+        out_be32((volatile unsigned *)GPIO0_TSRH, in_be32((volatile unsigned *)GPIO0_TSRH) & 0xFF3FFFFF);
         /* high-impedecence */
-        out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) & (~NAND_RB_GPIO_PIN));
+        out_be32((volatile unsigned *)GPIO0_TCR, in_be32((volatile unsigned *)GPIO0_TCR) & (~NAND_RB_GPIO_PIN));
         /* input select */
-        out_be32((volatile unsigned*)GPIO0_ISR1H, (in_be32((volatile unsigned*)GPIO0_ISR1H) & 0xFF3FFFFF) | 0x00400000);
+        out_be32((volatile unsigned *)GPIO0_ISR1H,
+                 (in_be32((volatile unsigned *)GPIO0_ISR1H) & 0xFF3FFFFF) | 0x00400000);
 #endif
 
         /* insert callbacks */
         this->IO_ADDR_R = ppchameleon_fio_base;
         this->IO_ADDR_W = ppchameleon_fio_base;
-        this->hwcontrol = ppchameleon_hwcontrol;
+        this->cmd_ctrl = ppchameleon_hwcontrol;
 #ifdef USE_READY_BUSY_PIN
         this->dev_ready = ppchameleon_device_ready;
 #endif
         this->chip_delay = NAND_BIG_DELAY_US;
         /* ECC mode */
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
 
         /* Scan to find existence of the device (it could not be mounted) */
-        if (nand_scan (ppchameleon_mtd, 1)) {
+        if (nand_scan(ppchameleon_mtd, 1)) {
                 iounmap((void *)ppchameleon_fio_base);
-                kfree (ppchameleon_mtd);
+                kfree(ppchameleon_mtd);
                 goto nand_evb_init;
         }
-
 #ifndef USE_READY_BUSY_PIN
         /* Adjust delay if necessary */
         if (ppchameleon_mtd->size == NAND_SMALL_SIZE)
@@ -275,12 +289,11 @@ static int __init ppchameleonevb_init (void)
         ppchameleon_mtd->name = "ppchameleon-nand";
         mtd_parts_nb = parse_mtd_partitions(ppchameleon_mtd, part_probes, &mtd_parts, 0);
         if (mtd_parts_nb > 0)
-          part_type = "command line";
+                part_type = "command line";
         else
-          mtd_parts_nb = 0;
+                mtd_parts_nb = 0;
 #endif
-        if (mtd_parts_nb == 0)
-        {
+        if (mtd_parts_nb == 0) {
                 if (ppchameleon_mtd->size == NAND_SMALL_SIZE)
                         mtd_parts = partition_info_me;
                 else
@@ -293,13 +306,12 @@ static int __init ppchameleonevb_init (void)
         printk(KERN_NOTICE "Using %s partition definition\n", part_type);
         add_mtd_partitions(ppchameleon_mtd, mtd_parts, mtd_parts_nb);
 
-nand_evb_init:
+ nand_evb_init:
         /****************************
         * EVB NAND (always present) *
         ****************************/
         /* Allocate memory for MTD device structure and private data */
-        ppchameleonevb_mtd = kmalloc(sizeof(struct mtd_info) +
-                                                         sizeof(struct nand_chip), GFP_KERNEL);
+        ppchameleonevb_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!ppchameleonevb_mtd) {
                 printk("Unable to allocate PPChameleonEVB NAND MTD device structure.\n");
                 return -ENOMEM;
@@ -307,77 +319,76 @@ nand_evb_init:
 
         /* map physical address */
         ppchameleonevb_fio_base = ioremap(ppchameleonevb_fio_pbase, SZ_4M);
-        if(!ppchameleonevb_fio_base) {
+        if (!ppchameleonevb_fio_base) {
                 printk("ioremap PPChameleonEVB NAND flash failed\n");
                 kfree(ppchameleonevb_mtd);
                 return -EIO;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&ppchameleonevb_mtd[1]);
+        this = (struct nand_chip *)(&ppchameleonevb_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) ppchameleonevb_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(ppchameleonevb_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         ppchameleonevb_mtd->priv = this;
 
-        /* Initialize GPIOs */
+        /* Initialize GPIOs */
         /* Pin mapping for NAND chip */
         /*
-                CE      GPIO_14
-                CLE     GPIO_15
-                ALE     GPIO_16
-                R/B     GPIO_31
-        */
+           CE   GPIO_14
+           CLE  GPIO_15
+           ALE  GPIO_16
+           R/B  GPIO_31
+         */
         /* output select */
-        out_be32((volatile unsigned*)GPIO0_OSRH, in_be32((volatile unsigned*)GPIO0_OSRH) & 0xFFFFFFF0);
-        out_be32((volatile unsigned*)GPIO0_OSRL, in_be32((volatile unsigned*)GPIO0_OSRL) & 0x3FFFFFFF);
+        out_be32((volatile unsigned *)GPIO0_OSRH, in_be32((volatile unsigned *)GPIO0_OSRH) & 0xFFFFFFF0);
+        out_be32((volatile unsigned *)GPIO0_OSRL, in_be32((volatile unsigned *)GPIO0_OSRL) & 0x3FFFFFFF);
         /* three-state select */
-        out_be32((volatile unsigned*)GPIO0_TSRH, in_be32((volatile unsigned*)GPIO0_TSRH) & 0xFFFFFFF0);
-        out_be32((volatile unsigned*)GPIO0_TSRL, in_be32((volatile unsigned*)GPIO0_TSRL) & 0x3FFFFFFF);
+        out_be32((volatile unsigned *)GPIO0_TSRH, in_be32((volatile unsigned *)GPIO0_TSRH) & 0xFFFFFFF0);
+        out_be32((volatile unsigned *)GPIO0_TSRL, in_be32((volatile unsigned *)GPIO0_TSRL) & 0x3FFFFFFF);
         /* enable output driver */
-        out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) | NAND_EVB_nCE_GPIO_PIN |
+        out_be32((volatile unsigned *)GPIO0_TCR, in_be32((volatile unsigned *)GPIO0_TCR) | NAND_EVB_nCE_GPIO_PIN |
                  NAND_EVB_CLE_GPIO_PIN | NAND_EVB_ALE_GPIO_PIN);
 #ifdef USE_READY_BUSY_PIN
         /* three-state select */
-        out_be32((volatile unsigned*)GPIO0_TSRL, in_be32((volatile unsigned*)GPIO0_TSRL) & 0xFFFFFFFC);
+        out_be32((volatile unsigned *)GPIO0_TSRL, in_be32((volatile unsigned *)GPIO0_TSRL) & 0xFFFFFFFC);
         /* high-impedecence */
-        out_be32((volatile unsigned*)GPIO0_TCR, in_be32((volatile unsigned*)GPIO0_TCR) & (~NAND_EVB_RB_GPIO_PIN));
+        out_be32((volatile unsigned *)GPIO0_TCR, in_be32((volatile unsigned *)GPIO0_TCR) & (~NAND_EVB_RB_GPIO_PIN));
         /* input select */
-        out_be32((volatile unsigned*)GPIO0_ISR1L, (in_be32((volatile unsigned*)GPIO0_ISR1L) & 0xFFFFFFFC) | 0x00000001);
+        out_be32((volatile unsigned *)GPIO0_ISR1L,
+                 (in_be32((volatile unsigned *)GPIO0_ISR1L) & 0xFFFFFFFC) | 0x00000001);
 #endif
 
         /* insert callbacks */
         this->IO_ADDR_R = ppchameleonevb_fio_base;
         this->IO_ADDR_W = ppchameleonevb_fio_base;
-        this->hwcontrol = ppchameleonevb_hwcontrol;
+        this->cmd_ctrl = ppchameleonevb_hwcontrol;
 #ifdef USE_READY_BUSY_PIN
         this->dev_ready = ppchameleonevb_device_ready;
 #endif
         this->chip_delay = NAND_SMALL_DELAY_US;
 
         /* ECC mode */
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
 
         /* Scan to find existence of the device */
-        if (nand_scan (ppchameleonevb_mtd, 1)) {
+        if (nand_scan(ppchameleonevb_mtd, 1)) {
                 iounmap((void *)ppchameleonevb_fio_base);
-                kfree (ppchameleonevb_mtd);
+                kfree(ppchameleonevb_mtd);
                 return -ENXIO;
         }
-
 #ifdef CONFIG_MTD_PARTITIONS
         ppchameleonevb_mtd->name = NAND_EVB_MTD_NAME;
         mtd_parts_nb = parse_mtd_partitions(ppchameleonevb_mtd, part_probes_evb, &mtd_parts, 0);
         if (mtd_parts_nb > 0)
-          part_type = "command line";
+                part_type = "command line";
         else
-          mtd_parts_nb = 0;
+                mtd_parts_nb = 0;
 #endif
-        if (mtd_parts_nb == 0)
-        {
+        if (mtd_parts_nb == 0) {
                 mtd_parts = partition_info_evb;
                 mtd_parts_nb = NUM_PARTITIONS;
                 part_type = "static";
@@ -390,18 +401,19 @@ nand_evb_init:
         /* Return happy */
         return 0;
 }
+
 module_init(ppchameleonevb_init);
 
 /*
  * Clean up routine
  */
-static void __exit ppchameleonevb_cleanup (void)
+static void __exit ppchameleonevb_cleanup(void)
 {
         struct nand_chip *this;
 
         /* Release resources, unregister device(s) */
-        nand_release (ppchameleon_mtd);
-        nand_release (ppchameleonevb_mtd);
+        nand_release(ppchameleon_mtd);
+        nand_release(ppchameleonevb_mtd);
 
         /* Release iomaps */
         this = (struct nand_chip *) &ppchameleon_mtd[1];
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c
index 4129c03dfd90..f8c49645324d 100644
--- a/drivers/mtd/nand/rtc_from4.c
+++ b/drivers/mtd/nand/rtc_from4.c
@@ -97,12 +97,12 @@ static struct mtd_info *rtc_from4_mtd = NULL;
 static void __iomem *rtc_from4_fio_base = (void *)P2SEGADDR(RTC_FROM4_FIO_BASE);
 
 static const struct mtd_partition partition_info[] = {
-        {
-                .name   = "Renesas flash partition 1",
-                .offset = 0,
-                .size   = MTDPART_SIZ_FULL
-        },
+        {
+         .name = "Renesas flash partition 1",
+         .offset = 0,
+         .size = MTDPART_SIZ_FULL},
 };
+
 #define NUM_PARTITIONS 1
 
 /*
@@ -111,8 +111,8 @@ static const struct mtd_partition partition_info[] = {
  *              NAND_BBT_CREATE and/or NAND_BBT_WRITE
  *
  */
-static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' };
-static uint8_t mirror_pattern[] = {'1', 't', 'b', 'B' };
+static uint8_t bbt_pattern[] = { 'B', 'b', 't', '0' };
+static uint8_t mirror_pattern[] = { '1', 't', 'b', 'B' };
 
 static struct nand_bbt_descr rtc_from4_bbt_main_descr = {
         .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
@@ -134,8 +134,6 @@ static struct nand_bbt_descr rtc_from4_bbt_mirror_descr = {
         .pattern = mirror_pattern
 };
 
-
-
 #ifdef RTC_FROM4_HWECC
 
 /* the Reed Solomon control structure */
@@ -144,15 +142,14 @@ static struct rs_control *rs_decoder;
 /*
  *      hardware specific Out Of Band information
  */
-static struct nand_oobinfo rtc_from4_nand_oobinfo = {
-        .useecc = MTD_NANDECC_AUTOPLACE,
+static struct nand_ecclayout rtc_from4_nand_oobinfo = {
         .eccbytes = 32,
         .eccpos = {
-                 0,  1,  2,  3,  4,  5,  6,  7,
-                 8,  9, 10, 11, 12, 13, 14, 15,
-                16, 17, 18, 19, 20, 21, 22, 23,
-                24, 25, 26, 27, 28, 29, 30, 31},
-        .oobfree = { {32, 32} }
+                   0, 1, 2, 3, 4, 5, 6, 7,
+                   8, 9, 10, 11, 12, 13, 14, 15,
+                   16, 17, 18, 19, 20, 21, 22, 23,
+                   24, 25, 26, 27, 28, 29, 30, 31},
+        .oobfree = {{32, 32}}
 };
 
 /* Aargh. I missed the reversed bit order, when I
@@ -162,44 +159,42 @@ static struct nand_oobinfo rtc_from4_nand_oobinfo = {
  * of the ecc byte which we get from the FPGA
  */
 static uint8_t revbits[256] = {
-        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
+        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
+        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
+        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
+        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
+        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
+        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
+        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
+        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
+        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
+        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
+        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
+        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
+        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
+        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
+        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
+        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
+        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
+        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
+        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
+        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
+        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
+        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
+        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
+        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
+        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
+        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
+        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
+        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
+        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
+        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
+        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
+        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
 };
 
 #endif
 
-
-
 /*
  * rtc_from4_hwcontrol - hardware specific access to control-lines
  * @mtd:        MTD device structure
@@ -212,35 +207,20 @@ static uint8_t revbits[256] = {
  * Address lines (A24-A22), so no action is required here.
  *
  */
-static void rtc_from4_hwcontrol(struct mtd_info *mtd, int cmd)
+static void rtc_from4_hwcontrol(struct mtd_info *mtd, int cmd,
+                                unsigned int ctrl)
 {
-        struct nand_chip* this = (struct nand_chip *) (mtd->priv);
-
-        switch(cmd) {
+        struct nand_chip *chip = (mtd->priv);
 
-        case NAND_CTL_SETCLE:
-                this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W | RTC_FROM4_CLE);
-                break;
-        case NAND_CTL_CLRCLE:
-                this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W & ~RTC_FROM4_CLE);
-                break;
-
-        case NAND_CTL_SETALE:
-                this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W | RTC_FROM4_ALE);
-                break;
-        case NAND_CTL_CLRALE:
-                this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W & ~RTC_FROM4_ALE);
-                break;
+        if (cmd == NAND_CMD_NONE)
+                return;
 
-        case NAND_CTL_SETNCE:
-                break;
-        case NAND_CTL_CLRNCE:
-                break;
-
-        }
+        if (ctrl & NAND_CLE)
+                writeb(cmd, chip->IO_ADDR_W | RTC_FROM4_CLE);
+        else
+                writeb(cmd, chip->IO_ADDR_W | RTC_FROM4_ALE);
 }
 
-
 /*
  * rtc_from4_nand_select_chip - hardware specific chip select
  * @mtd:        MTD device structure
@@ -252,26 +232,25 @@ static void rtc_from4_hwcontrol(struct mtd_info *mtd, int cmd)
  */
 static void rtc_from4_nand_select_chip(struct mtd_info *mtd, int chip)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *this = mtd->priv;
 
         this->IO_ADDR_R = (void __iomem *)((unsigned long)this->IO_ADDR_R & ~RTC_FROM4_NAND_ADDR_MASK);
         this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W & ~RTC_FROM4_NAND_ADDR_MASK);
 
-        switch(chip) {
+        switch (chip) {
 
-        case 0:         /* select slot 3 chip */
+        case 0:         /* select slot 3 chip */
                 this->IO_ADDR_R = (void __iomem *)((unsigned long)this->IO_ADDR_R | RTC_FROM4_NAND_ADDR_SLOT3);
                 this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W | RTC_FROM4_NAND_ADDR_SLOT3);
-                break;
-        case 1:         /* select slot 4 chip */
+                break;
+        case 1:         /* select slot 4 chip */
                 this->IO_ADDR_R = (void __iomem *)((unsigned long)this->IO_ADDR_R | RTC_FROM4_NAND_ADDR_SLOT4);
                 this->IO_ADDR_W = (void __iomem *)((unsigned long)this->IO_ADDR_W | RTC_FROM4_NAND_ADDR_SLOT4);
-                break;
+                break;
 
-        }
+        }
 }
 
-
 /*
  * rtc_from4_nand_device_ready - hardware specific ready/busy check
  * @mtd:        MTD device structure
@@ -290,7 +269,6 @@ static int rtc_from4_nand_device_ready(struct mtd_info *mtd)
 
 }
 
-
 /*
  * deplete - code to perform device recovery in case there was a power loss
  * @mtd:        MTD device structure
@@ -306,24 +284,23 @@ static int rtc_from4_nand_device_ready(struct mtd_info *mtd)
  */
 static void deplete(struct mtd_info *mtd, int chip)
 {
-        struct nand_chip *this = mtd->priv;
+        struct nand_chip *this = mtd->priv;
 
-        /* wait until device is ready */
-        while (!this->dev_ready(mtd));
+        /* wait until device is ready */
+        while (!this->dev_ready(mtd)) ;
 
         this->select_chip(mtd, chip);
 
         /* Send the commands for device recovery, phase 1 */
-        this->cmdfunc (mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0000);
-        this->cmdfunc (mtd, NAND_CMD_DEPLETE2, -1, -1);
+        this->cmdfunc(mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0000);
+        this->cmdfunc(mtd, NAND_CMD_DEPLETE2, -1, -1);
 
         /* Send the commands for device recovery, phase 2 */
-        this->cmdfunc (mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0004);
-        this->cmdfunc (mtd, NAND_CMD_DEPLETE2, -1, -1);
+        this->cmdfunc(mtd, NAND_CMD_DEPLETE1, 0x0000, 0x0004);
+        this->cmdfunc(mtd, NAND_CMD_DEPLETE2, -1, -1);
 
 }
 
-
 #ifdef RTC_FROM4_HWECC
 /*
  * rtc_from4_enable_hwecc - hardware specific hardware ECC enable function
@@ -335,39 +312,35 @@ static void deplete(struct mtd_info *mtd, int chip)
  */
 static void rtc_from4_enable_hwecc(struct mtd_info *mtd, int mode)
 {
-        volatile unsigned short * rs_ecc_ctl = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC_CTL);
+        volatile unsigned short *rs_ecc_ctl = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC_CTL);
         unsigned short status;
 
         switch (mode) {
-            case NAND_ECC_READ :
-                status =  RTC_FROM4_RS_ECC_CTL_CLR
-                        | RTC_FROM4_RS_ECC_CTL_FD_E;
+        case NAND_ECC_READ:
+                status = RTC_FROM4_RS_ECC_CTL_CLR | RTC_FROM4_RS_ECC_CTL_FD_E;
 
                 *rs_ecc_ctl = status;
                 break;
 
-            case NAND_ECC_READSYN :
-                status =  0x00;
+        case NAND_ECC_READSYN:
+                status = 0x00;
 
                 *rs_ecc_ctl = status;
                 break;
 
-            case NAND_ECC_WRITE :
-                status =  RTC_FROM4_RS_ECC_CTL_CLR
-                        | RTC_FROM4_RS_ECC_CTL_GEN
-                        | RTC_FROM4_RS_ECC_CTL_FD_E;
+        case NAND_ECC_WRITE:
+                status = RTC_FROM4_RS_ECC_CTL_CLR | RTC_FROM4_RS_ECC_CTL_GEN | RTC_FROM4_RS_ECC_CTL_FD_E;
 
                 *rs_ecc_ctl = status;
                 break;
 
-            default:
+        default:
                 BUG();
                 break;
         }
 
 }
 
-
 /*
  * rtc_from4_calculate_ecc - hardware specific code to read ECC code
  * @mtd:        MTD device structure
@@ -383,7 +356,7 @@ static void rtc_from4_enable_hwecc(struct mtd_info *mtd, int mode)
  */
 static void rtc_from4_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
 {
-        volatile unsigned short * rs_eccn = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECCN);
+        volatile unsigned short *rs_eccn = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECCN);
         unsigned short value;
         int i;
 
@@ -395,7 +368,6 @@ static void rtc_from4_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_c
         ecc_code[7] |= 0x0f;    /* set the last four bits (not used) */
 }
 
-
 /*
  * rtc_from4_correct_data - hardware specific code to correct data using ECC code
  * @mtd:        MTD device structure
@@ -414,7 +386,7 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
         unsigned short status;
         uint16_t par[6], syn[6];
         uint8_t ecc[8];
-        volatile unsigned short *rs_ecc;
+        volatile unsigned short *rs_ecc;
 
         status = *((volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC_CHK));
 
@@ -424,23 +396,18 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
 
         /* Read the syndrom pattern from the FPGA and correct the bitorder */
         rs_ecc = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC);
-        for (i = 0; i < 8; i++) {
-                ecc[i] = revbits[(*rs_ecc) & 0xFF];
-                rs_ecc++;
-        }
+        for (i = 0; i < 8; i++) {
+                ecc[i] = revbits[(*rs_ecc) & 0xFF];
+                rs_ecc++;
+        }
 
         /* convert into 6 10bit syndrome fields */
-        par[5] = rs_decoder->index_of[(((uint16_t)ecc[0] >> 0) & 0x0ff) |
-                                      (((uint16_t)ecc[1] << 8) & 0x300)];
-        par[4] = rs_decoder->index_of[(((uint16_t)ecc[1] >> 2) & 0x03f) |
-                                      (((uint16_t)ecc[2] << 6) & 0x3c0)];
-        par[3] = rs_decoder->index_of[(((uint16_t)ecc[2] >> 4) & 0x00f) |
-                                      (((uint16_t)ecc[3] << 4) & 0x3f0)];
-        par[2] = rs_decoder->index_of[(((uint16_t)ecc[3] >> 6) & 0x003) |
-                                      (((uint16_t)ecc[4] << 2) & 0x3fc)];
-        par[1] = rs_decoder->index_of[(((uint16_t)ecc[5] >> 0) & 0x0ff) |
-                                      (((uint16_t)ecc[6] << 8) & 0x300)];
-        par[0] = (((uint16_t)ecc[6] >> 2) & 0x03f) | (((uint16_t)ecc[7] << 6) & 0x3c0);
+        par[5] = rs_decoder->index_of[(((uint16_t) ecc[0] >> 0) & 0x0ff) | (((uint16_t) ecc[1] << 8) & 0x300)];
+        par[4] = rs_decoder->index_of[(((uint16_t) ecc[1] >> 2) & 0x03f) | (((uint16_t) ecc[2] << 6) & 0x3c0)];
+        par[3] = rs_decoder->index_of[(((uint16_t) ecc[2] >> 4) & 0x00f) | (((uint16_t) ecc[3] << 4) & 0x3f0)];
+        par[2] = rs_decoder->index_of[(((uint16_t) ecc[3] >> 6) & 0x003) | (((uint16_t) ecc[4] << 2) & 0x3fc)];
+        par[1] = rs_decoder->index_of[(((uint16_t) ecc[5] >> 0) & 0x0ff) | (((uint16_t) ecc[6] << 8) & 0x300)];
+        par[0] = (((uint16_t) ecc[6] >> 2) & 0x03f) | (((uint16_t) ecc[7] << 6) & 0x3c0);
 
         /* Convert to computable syndrome */
         for (i = 0; i < 6; i++) {
@@ -453,16 +420,14 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
                 syn[i] = rs_decoder->index_of[syn[i]];
         }
 
-        /* Let the library code do its magic.*/
-        res = decode_rs8(rs_decoder, (uint8_t *)buf, par, 512, syn, 0, NULL, 0xff, NULL);
+        /* Let the library code do its magic. */
+        res = decode_rs8(rs_decoder, (uint8_t *) buf, par, 512, syn, 0, NULL, 0xff, NULL);
         if (res > 0) {
-                DEBUG (MTD_DEBUG_LEVEL0, "rtc_from4_correct_data: "
-                        "ECC corrected %d errors on read\n", res);
+                DEBUG(MTD_DEBUG_LEVEL0, "rtc_from4_correct_data: " "ECC corrected %d errors on read\n", res);
         }
         return res;
 }
 
-
 /**
  * rtc_from4_errstat - perform additional error status checks
  * @mtd:        MTD device structure
@@ -478,54 +443,66 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
  * note: see pages 34..37 of data sheet for details.
  *
  */
-static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, int state, int status, int page)
+static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this,
+                             int state, int status, int page)
 {
-        int     er_stat=0;
-        int     rtn, retlen;
-        size_t  len;
+        int er_stat = 0;
+        int rtn, retlen;
+        size_t len;
         uint8_t *buf;
-        int     i;
-
-        this->cmdfunc (mtd, NAND_CMD_STATUS_CLEAR, -1, -1);
-
-        if (state == FL_ERASING) {
-                for (i=0; i<4; i++) {
-                        if (status & 1<<(i+1)) {
-                                this->cmdfunc (mtd, (NAND_CMD_STATUS_ERROR + i + 1), -1, -1);
-                                rtn = this->read_byte(mtd);
-                                this->cmdfunc (mtd, NAND_CMD_STATUS_RESET, -1, -1);
-                                if (!(rtn & ERR_STAT_ECC_AVAILABLE)) {
-                                        er_stat |= 1<<(i+1);    /* err_ecc_not_avail */
-                                }
-                        }
+        int i;
+
+        this->cmdfunc(mtd, NAND_CMD_STATUS_CLEAR, -1, -1);
+
+        if (state == FL_ERASING) {
+
+                for (i = 0; i < 4; i++) {
+                        if (!(status & 1 << (i + 1)))
+                                continue;
+                        this->cmdfunc(mtd, (NAND_CMD_STATUS_ERROR + i + 1),
+                                      -1, -1);
+                        rtn = this->read_byte(mtd);
+                        this->cmdfunc(mtd, NAND_CMD_STATUS_RESET, -1, -1);
+
+                        /* err_ecc_not_avail */
+                        if (!(rtn & ERR_STAT_ECC_AVAILABLE))
+                                er_stat |= 1 << (i + 1);
                 }
+
         } else if (state == FL_WRITING) {
+
+                unsigned long corrected = mtd->ecc_stats.corrected;
+
                 /* single bank write logic */
-                this->cmdfunc (mtd, NAND_CMD_STATUS_ERROR, -1, -1);
+                this->cmdfunc(mtd, NAND_CMD_STATUS_ERROR, -1, -1);
                 rtn = this->read_byte(mtd);
-                this->cmdfunc (mtd, NAND_CMD_STATUS_RESET, -1, -1);
+                this->cmdfunc(mtd, NAND_CMD_STATUS_RESET, -1, -1);
+
                 if (!(rtn & ERR_STAT_ECC_AVAILABLE)) {
-                        er_stat |= 1<<1;        /* err_ecc_not_avail */
-                } else {
-                        len = mtd->oobblock;
-                        buf = kmalloc (len, GFP_KERNEL);
-                        if (!buf) {
-                                printk (KERN_ERR "rtc_from4_errstat: Out of memory!\n");
-                                er_stat = 1;                    /* if we can't check, assume failed */
-                        } else {
-                                /* recovery read */
-                                /* page read */
-                                rtn = nand_do_read_ecc (mtd, page, len, &retlen, buf, NULL, this->autooob, 1);
-                                if (rtn) {      /* if read failed or > 1-bit error corrected */
-                                        er_stat |= 1<<1;        /* ECC read failed */
-                                }
-                                kfree(buf);
-                        }
+                        /* err_ecc_not_avail */
+                        er_stat |= 1 << 1;
+                        goto out;
+                }
+
+                len = mtd->writesize;
+                buf = kmalloc(len, GFP_KERNEL);
+                if (!buf) {
+                        printk(KERN_ERR "rtc_from4_errstat: Out of memory!\n");
+                        er_stat = 1;
+                        goto out;
                 }
+
+                /* recovery read */
+                rtn = nand_do_read(mtd, page, len, &retlen, buf);
+
+                /* if read failed or > 1-bit error corrected */
+                if (rtn || (mtd->ecc_stats.corrected - corrected) > 1) {
+                        er_stat |= 1 << 1;
+                kfree(buf);
         }
 
         rtn = status;
-        if (er_stat == 0) {                             /* if ECC is available   */
+        if (er_stat == 0) {     /* if ECC is available   */
                 rtn = (status & ~NAND_STATUS_FAIL);     /*   clear the error bit */
         }
 
@@ -533,33 +510,32 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this, int s
 }
 #endif
 
-
 /*
  * Main initialization routine
  */
-int __init rtc_from4_init (void)
+static int __init rtc_from4_init(void)
 {
         struct nand_chip *this;
         unsigned short bcr1, bcr2, wcr2;
         int i;
 
         /* Allocate memory for MTD device structure and private data */
-        rtc_from4_mtd = kmalloc(sizeof(struct mtd_info) + sizeof (struct nand_chip),
-                                GFP_KERNEL);
+        rtc_from4_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!rtc_from4_mtd) {
-                printk ("Unable to allocate Renesas NAND MTD device structure.\n");
+                printk("Unable to allocate Renesas NAND MTD device structure.\n");
                 return -ENOMEM;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&rtc_from4_mtd[1]);
+        this = (struct nand_chip *)(&rtc_from4_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) rtc_from4_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(rtc_from4_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         rtc_from4_mtd->priv = this;
+        rtc_from4_mtd->owner = THIS_MODULE;
 
         /* set area 5 as PCMCIA mode to clear the spec of tDH(Data hold time;9ns min) */
         bcr1 = *SH77X9_BCR1 & ~0x0002;
@@ -580,9 +556,9 @@ int __init rtc_from4_init (void)
         this->IO_ADDR_R = rtc_from4_fio_base;
         this->IO_ADDR_W = rtc_from4_fio_base;
         /* Set address of hardware control function */
-        this->hwcontrol = rtc_from4_hwcontrol;
+        this->cmd_ctrl = rtc_from4_hwcontrol;
         /* Set address of chip select function */
-        this->select_chip = rtc_from4_nand_select_chip;
+        this->select_chip = rtc_from4_nand_select_chip;
         /* command delay time (in us) */
         this->chip_delay = 100;
         /* return the status of the Ready/Busy line */
@@ -591,19 +567,20 @@ int __init rtc_from4_init (void)
 #ifdef RTC_FROM4_HWECC
         printk(KERN_INFO "rtc_from4_init: using hardware ECC detection.\n");
 
-        this->eccmode = NAND_ECC_HW8_512;
-        this->options |= NAND_HWECC_SYNDROME;
+        this->ecc.mode = NAND_ECC_HW_SYNDROME;
+        this->ecc.size = 512;
+        this->ecc.bytes = 8;
         /* return the status of extra status and ECC checks */
         this->errstat = rtc_from4_errstat;
         /* set the nand_oobinfo to support FPGA H/W error detection */
-        this->autooob = &rtc_from4_nand_oobinfo;
-        this->enable_hwecc = rtc_from4_enable_hwecc;
-        this->calculate_ecc = rtc_from4_calculate_ecc;
-        this->correct_data = rtc_from4_correct_data;
+        this->ecc.layout = &rtc_from4_nand_oobinfo;
+        this->ecc.hwctl = rtc_from4_enable_hwecc;
+        this->ecc.calculate = rtc_from4_calculate_ecc;
+        this->ecc.correct = rtc_from4_correct_data;
 #else
         printk(KERN_INFO "rtc_from4_init: using software ECC detection.\n");
 
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
 #endif
 
         /* set the bad block tables to support debugging */
@@ -617,7 +594,7 @@ int __init rtc_from4_init (void)
         }
 
         /* Perform 'device recovery' for each chip in case there was a power loss. */
-        for (i=0; i < this->numchips; i++) {
+        for (i = 0; i < this->numchips; i++) {
                 deplete(rtc_from4_mtd, i);
         }
 
@@ -643,7 +620,7 @@ int __init rtc_from4_init (void)
          */
         rs_decoder = init_rs(10, 0x409, 0, 1, 6);
         if (!rs_decoder) {
-                printk (KERN_ERR "Could not create a RS decoder\n");
+                printk(KERN_ERR "Could not create a RS decoder\n");
                 nand_release(rtc_from4_mtd);
                 kfree(rtc_from4_mtd);
                 return -ENOMEM;
@@ -652,20 +629,19 @@ int __init rtc_from4_init (void)
         /* Return happy */
         return 0;
 }
-module_init(rtc_from4_init);
 
+module_init(rtc_from4_init);
 
 /*
  * Clean up routine
  */
-#ifdef MODULE
-static void __exit rtc_from4_cleanup (void)
+static void __exit rtc_from4_cleanup(void)
 {
         /* Release resource, unregister partitions */
         nand_release(rtc_from4_mtd);
 
         /* Free the MTD device structure */
-        kfree (rtc_from4_mtd);
+        kfree(rtc_from4_mtd);
 
 #ifdef RTC_FROM4_HWECC
         /* Free the reed solomon resources */
@@ -674,10 +650,9 @@ static void __exit rtc_from4_cleanup (void)
         }
 #endif
 }
+
 module_exit(rtc_from4_cleanup);
-#endif
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("d.marlin <dmarlin@redhat.com");
 MODULE_DESCRIPTION("Board-specific glue layer for AG-AND flash on Renesas FROM_BOARD4");
-
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 5b55599739f3..2c262fe03d8a 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -18,8 +18,9 @@
  *      20-Jun-2005  BJD  Updated s3c2440 support, fixed timing bug
  *      08-Jul-2005  BJD  Fix OOPS when no platform data supplied
  *      20-Oct-2005  BJD  Fix timing calculation bug
+ *      14-Jan-2006  BJD  Allow clock to be stopped when idle
  *
- * $Id: s3c2410.c,v 1.20 2005/11/07 11:14:31 gleixner Exp $
+ * $Id: s3c2410.c,v 1.23 2006/04/01 18:06:29 bjd Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,9 +37,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <config/mtd/nand/s3c2410/hwecc.h>
-#include <config/mtd/nand/s3c2410/debug.h>
-
 #ifdef CONFIG_MTD_NAND_S3C2410_DEBUG
 #define DEBUG
 #endif
@@ -73,14 +71,20 @@ static int hardware_ecc = 1;
 static int hardware_ecc = 0;
 #endif
 
+#ifdef CONFIG_MTD_NAND_S3C2410_CLKSTOP
+static int clock_stop = 1;
+#else
+static const int clock_stop = 0;
+#endif
+
+
 /* new oob placement block for use with hardware ecc generation
  */
 
-static struct nand_oobinfo nand_hw_eccoob = {
-        .useecc         = MTD_NANDECC_AUTOPLACE,
-        .eccbytes       = 3,
-        .eccpos         = {0, 1, 2 },
-        .oobfree        = { {8, 8} }
+static struct nand_ecclayout nand_hw_eccoob = {
+        .eccbytes = 3,
+        .eccpos = {0, 1, 2},
+        .oobfree = {{8, 8}}
 };
 
 /* controller and mtd information */
@@ -135,6 +139,11 @@ static struct s3c2410_platform_nand *to_nand_plat(struct platform_device *dev)
         return dev->dev.platform_data;
 }
 
+static inline int allow_clk_stop(struct s3c2410_nand_info *info)
+{
+        return clock_stop;
+}
+
 /* timing calculations */
 
 #define NS_IN_KHZ 1000000
@@ -149,8 +158,7 @@ static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)
         pr_debug("result %d from %ld, %d\n", result, clk, wanted);
 
         if (result > max) {
-                printk("%d ns is too big for current clock rate %ld\n",
-                       wanted, clk);
+                printk("%d ns is too big for current clock rate %ld\n", wanted, clk);
                 return -1;
         }
 
@@ -164,8 +172,7 @@ static int s3c2410_nand_calc_rate(int wanted, unsigned long clk, int max)
 
 /* controller setup */
 
-static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
-                               struct platform_device *pdev)
+static int s3c2410_nand_inithw(struct s3c2410_nand_info *info, struct platform_device *pdev)
 {
         struct s3c2410_platform_nand *plat = to_nand_plat(pdev);
         unsigned long clkrate = clk_get_rate(info->clk);
@@ -177,7 +184,7 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
         clkrate /= 1000;        /* turn clock into kHz for ease of use */
 
         if (plat != NULL) {
-                tacls  = s3c2410_nand_calc_rate(plat->tacls, clkrate, 4);
+                tacls = s3c2410_nand_calc_rate(plat->tacls, clkrate, 4);
                 twrph0 = s3c2410_nand_calc_rate(plat->twrph0, clkrate, 8);
                 twrph1 = s3c2410_nand_calc_rate(plat->twrph1, clkrate, 8);
         } else {
@@ -193,19 +200,22 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
         }
 
         printk(KERN_INFO PFX "Tacls=%d, %dns Twrph0=%d %dns, Twrph1=%d %dns\n",
-               tacls, to_ns(tacls, clkrate),
-               twrph0, to_ns(twrph0, clkrate),
-               twrph1, to_ns(twrph1, clkrate));
+               tacls, to_ns(tacls, clkrate), twrph0, to_ns(twrph0, clkrate), twrph1, to_ns(twrph1, clkrate));
 
         if (!info->is_s3c2440) {
-                cfg  = S3C2410_NFCONF_EN;
-                cfg |= S3C2410_NFCONF_TACLS(tacls-1);
-                cfg |= S3C2410_NFCONF_TWRPH0(twrph0-1);
-                cfg |= S3C2410_NFCONF_TWRPH1(twrph1-1);
+                cfg = S3C2410_NFCONF_EN;
+                cfg |= S3C2410_NFCONF_TACLS(tacls - 1);
+                cfg |= S3C2410_NFCONF_TWRPH0(twrph0 - 1);
+                cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1);
         } else {
-                cfg   = S3C2440_NFCONF_TACLS(tacls-1);
-                cfg  |= S3C2440_NFCONF_TWRPH0(twrph0-1);
-                cfg  |= S3C2440_NFCONF_TWRPH1(twrph1-1);
+                cfg = S3C2440_NFCONF_TACLS(tacls - 1);
+                cfg |= S3C2440_NFCONF_TWRPH0(twrph0 - 1);
+                cfg |= S3C2440_NFCONF_TWRPH1(twrph1 - 1);
+
+                /* enable the controller and de-assert nFCE */
+
+                writel(S3C2440_NFCONT_ENABLE | S3C2440_NFCONT_ENABLE,
+                       info->regs + S3C2440_NFCONT);
         }
 
         pr_debug(PFX "NF_CONF is 0x%lx\n", cfg);
@@ -229,7 +239,10 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)
         info = nmtd->info;
 
         bit = (info->is_s3c2440) ? S3C2440_NFCONT_nFCE : S3C2410_NFCONF_nFCE;
-        reg = info->regs+((info->is_s3c2440) ? S3C2440_NFCONT:S3C2410_NFCONF);
+        reg = info->regs + ((info->is_s3c2440) ? S3C2440_NFCONT : S3C2410_NFCONF);
+
+        if (chip != -1 && allow_clk_stop(info))
+                clk_enable(info->clk);
 
         cur = readl(reg);
 
@@ -243,77 +256,51 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)
 
                 if (info->platform != NULL) {
                         if (info->platform->select_chip != NULL)
-                                (info->platform->select_chip)(nmtd->set, chip);
+                                (info->platform->select_chip) (nmtd->set, chip);
                 }
 
                 cur &= ~bit;
         }
 
         writel(cur, reg);
+
+        if (chip == -1 && allow_clk_stop(info))
+                clk_disable(info->clk);
 }
 
-/* command and control functions
- *
- * Note, these all use tglx's method of changing the IO_ADDR_W field
- * to make the code simpler, and use the nand layer's code to issue the
- * command and address sequences via the proper IO ports.
+/* s3c2410_nand_hwcontrol
  *
+ * Issue command and address cycles to the chip
 */
 
-static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd)
+static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
+                                   unsigned int ctrl)
 {
         struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
-        struct nand_chip *chip = mtd->priv;
-
-        switch (cmd) {
-        case NAND_CTL_SETNCE:
-        case NAND_CTL_CLRNCE:
-                printk(KERN_ERR "%s: called for NCE\n", __FUNCTION__);
-                break;
-
-        case NAND_CTL_SETCLE:
-                chip->IO_ADDR_W = info->regs + S3C2410_NFCMD;
-                break;
-
-        case NAND_CTL_SETALE:
-                chip->IO_ADDR_W = info->regs + S3C2410_NFADDR;
-                break;
-
-                /* NAND_CTL_CLRCLE: */
-                /* NAND_CTL_CLRALE: */
-        default:
-                chip->IO_ADDR_W = info->regs + S3C2410_NFDATA;
-                break;
-        }
+        
+        if (cmd == NAND_CMD_NONE)
+                return;
+
+        if (ctrl & NAND_CLE)
+                writeb(cmd, info->regs + S3C2410_NFCMD);
+        else
+                writeb(cmd, info->regs + S3C2410_NFADDR);
 }
 
 /* command and control functions */
 
-static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd)
+static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd,
+                                   unsigned int ctrl)
 {
         struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
-        struct nand_chip *chip = mtd->priv;
-
-        switch (cmd) {
-        case NAND_CTL_SETNCE:
-        case NAND_CTL_CLRNCE:
-                printk(KERN_ERR "%s: called for NCE\n", __FUNCTION__);
-                break;
-
-        case NAND_CTL_SETCLE:
-                chip->IO_ADDR_W = info->regs + S3C2440_NFCMD;
-                break;
-
-        case NAND_CTL_SETALE:
-                chip->IO_ADDR_W = info->regs + S3C2440_NFADDR;
-                break;
-
-                /* NAND_CTL_CLRCLE: */
-                /* NAND_CTL_CLRALE: */
-        default:
-                chip->IO_ADDR_W = info->regs + S3C2440_NFDATA;
-                break;
-        }
+
+        if (cmd == NAND_CMD_NONE)
+                return;
+
+        if (ctrl & NAND_CLE)
+                writeb(cmd, info->regs + S3C2440_NFCMD);
+        else
+                writeb(cmd, info->regs + S3C2440_NFADDR);
 }
 
 /* s3c2410_nand_devready()
@@ -330,22 +317,16 @@ static int s3c2410_nand_devready(struct mtd_info *mtd)
         return readb(info->regs + S3C2410_NFSTAT) & S3C2410_NFSTAT_BUSY;
 }
 
-
 /* ECC handling functions */
 
-static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,
-                                     u_char *read_ecc, u_char *calc_ecc)
+static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat, u_char *read_ecc, u_char *calc_ecc)
 {
-        pr_debug("s3c2410_nand_correct_data(%p,%p,%p,%p)\n",
-                 mtd, dat, read_ecc, calc_ecc);
+        pr_debug("s3c2410_nand_correct_data(%p,%p,%p,%p)\n", mtd, dat, read_ecc, calc_ecc);
 
         pr_debug("eccs: read %02x,%02x,%02x vs calc %02x,%02x,%02x\n",
-                 read_ecc[0], read_ecc[1], read_ecc[2],
-                 calc_ecc[0], calc_ecc[1], calc_ecc[2]);
+                 read_ecc[0], read_ecc[1], read_ecc[2], calc_ecc[0], calc_ecc[1], calc_ecc[2]);
 
-        if (read_ecc[0] == calc_ecc[0] &&
-            read_ecc[1] == calc_ecc[1] &&
-            read_ecc[2] == calc_ecc[2])
+        if (read_ecc[0] == calc_ecc[0] && read_ecc[1] == calc_ecc[1] && read_ecc[2] == calc_ecc[2])
                 return 0;
 
         /* we curently have no method for correcting the error */
@@ -378,8 +359,7 @@ static void s3c2440_nand_enable_hwecc(struct mtd_info *mtd, int mode)
         writel(ctrl | S3C2440_NFCONT_INITECC, info->regs + S3C2440_NFCONT);
 }
 
-static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd,
-                                      const u_char *dat, u_char *ecc_code)
+static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
 {
         struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
 
@@ -387,15 +367,12 @@ static int s3c2410_nand_calculate_ecc(struct mtd_info *mtd,
         ecc_code[1] = readb(info->regs + S3C2410_NFECC + 1);
         ecc_code[2] = readb(info->regs + S3C2410_NFECC + 2);
 
-        pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n",
-                 ecc_code[0], ecc_code[1], ecc_code[2]);
+        pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n", ecc_code[0], ecc_code[1], ecc_code[2]);
 
         return 0;
 }
 
-
-static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd,
-                                      const u_char *dat, u_char *ecc_code)
+static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u_char *ecc_code)
 {
         struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
         unsigned long ecc = readl(info->regs + S3C2440_NFMECC0);
@@ -404,13 +381,11 @@ static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd,
         ecc_code[1] = ecc >> 8;
         ecc_code[2] = ecc >> 16;
 
-        pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n",
-                 ecc_code[0], ecc_code[1], ecc_code[2]);
+        pr_debug("calculate_ecc: returning ecc %02x,%02x,%02x\n", ecc_code[0], ecc_code[1], ecc_code[2]);
 
         return 0;
 }
 
-
 /* over-ride the standard functions for a little more speed. We can
  * use read/write block to move the data buffers to/from the controller
 */
@@ -421,8 +396,7 @@ static void s3c2410_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
         readsb(this->IO_ADDR_R, buf, len);
 }
 
-static void s3c2410_nand_write_buf(struct mtd_info *mtd,
-                                   const u_char *buf, int len)
+static void s3c2410_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
         struct nand_chip *this = mtd->priv;
         writesb(this->IO_ADDR_W, buf, len);
@@ -459,7 +433,8 @@ static int s3c2410_nand_remove(struct platform_device *pdev)
         /* free the common resources */
 
         if (info->clk != NULL && !IS_ERR(info->clk)) {
-                clk_disable(info->clk);
+                if (!allow_clk_stop(info))
+                        clk_disable(info->clk);
                 clk_put(info->clk);
         }
 
@@ -488,9 +463,7 @@ static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
                 return add_mtd_device(&mtd->mtd);
 
         if (set->nr_partitions > 0 && set->partitions != NULL) {
-                return add_mtd_partitions(&mtd->mtd,
-                                          set->partitions,
-                                          set->nr_partitions);
+                return add_mtd_partitions(&mtd->mtd, set->partitions, set->nr_partitions);
         }
 
         return add_mtd_device(&mtd->mtd);
@@ -517,7 +490,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
 
         chip->IO_ADDR_R    = info->regs + S3C2410_NFDATA;
         chip->IO_ADDR_W    = info->regs + S3C2410_NFDATA;
-        chip->hwcontrol    = s3c2410_nand_hwcontrol;
+        chip->cmd_ctrl     = s3c2410_nand_hwcontrol;
         chip->dev_ready    = s3c2410_nand_devready;
         chip->write_buf    = s3c2410_nand_write_buf;
         chip->read_buf     = s3c2410_nand_read_buf;
@@ -530,26 +503,29 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
         if (info->is_s3c2440) {
                 chip->IO_ADDR_R  = info->regs + S3C2440_NFDATA;
                 chip->IO_ADDR_W  = info->regs + S3C2440_NFDATA;
-                chip->hwcontrol  = s3c2440_nand_hwcontrol;
+                chip->cmd_ctrl   = s3c2440_nand_hwcontrol;
         }
 
         nmtd->info         = info;
         nmtd->mtd.priv     = chip;
+        nmtd->mtd.owner    = THIS_MODULE;
         nmtd->set          = set;
 
         if (hardware_ecc) {
-                chip->correct_data  = s3c2410_nand_correct_data;
-                chip->enable_hwecc  = s3c2410_nand_enable_hwecc;
-                chip->calculate_ecc = s3c2410_nand_calculate_ecc;
-                chip->eccmode       = NAND_ECC_HW3_512;
-                chip->autooob       = &nand_hw_eccoob;
+                chip->ecc.correct   = s3c2410_nand_correct_data;
+                chip->ecc.hwctl     = s3c2410_nand_enable_hwecc;
+                chip->ecc.calculate = s3c2410_nand_calculate_ecc;
+                chip->ecc.mode      = NAND_ECC_HW;
+                chip->ecc.size      = 512;
+                chip->ecc.bytes     = 3;
+                chip->ecc.layout    = &nand_hw_eccoob;
 
                 if (info->is_s3c2440) {
-                        chip->enable_hwecc  = s3c2440_nand_enable_hwecc;
-                        chip->calculate_ecc = s3c2440_nand_calculate_ecc;
+                        chip->ecc.hwctl     = s3c2440_nand_enable_hwecc;
+                        chip->ecc.calculate = s3c2440_nand_calculate_ecc;
                 }
         } else {
-                chip->eccmode       = NAND_ECC_SOFT;
+                chip->ecc.mode      = NAND_ECC_SOFT;
         }
 }
 
@@ -654,13 +630,11 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)
         nmtd = info->mtds;
 
         for (setno = 0; setno < nr_sets; setno++, nmtd++) {
-                pr_debug("initialising set %d (%p, info %p)\n",
-                         setno, nmtd, info);
+                pr_debug("initialising set %d (%p, info %p)\n", setno, nmtd, info);
 
                 s3c2410_nand_init_chip(info, nmtd, sets);
 
-                nmtd->scan_res = nand_scan(&nmtd->mtd,
-                                           (sets) ? sets->nr_chips : 1);
+                nmtd->scan_res = nand_scan(&nmtd->mtd, (sets) ? sets->nr_chips : 1);
 
                 if (nmtd->scan_res == 0) {
                         s3c2410_nand_add_partition(info, nmtd, sets);
@@ -670,6 +644,11 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)
                         sets++;
         }
 
+        if (allow_clk_stop(info)) {
+                dev_info(&pdev->dev, "clock idle support enabled\n");
+                clk_disable(info->clk);
+        }
+
         pr_debug("initialised ok\n");
         return 0;
 
@@ -681,6 +660,41 @@ static int s3c24xx_nand_probe(struct platform_device *pdev, int is_s3c2440)
         return err;
 }
 
+/* PM Support */
+#ifdef CONFIG_PM
+
+static int s3c24xx_nand_suspend(struct platform_device *dev, pm_message_t pm)
+{
+        struct s3c2410_nand_info *info = platform_get_drvdata(dev);
+
+        if (info) {
+                if (!allow_clk_stop(info))
+                        clk_disable(info->clk);
+        }
+
+        return 0;
+}
+
+static int s3c24xx_nand_resume(struct platform_device *dev)
+{
+        struct s3c2410_nand_info *info = platform_get_drvdata(dev);
+
+        if (info) {
+                clk_enable(info->clk);
+                s3c2410_nand_inithw(info, dev);
+
+                if (allow_clk_stop(info))
+                        clk_disable(info->clk);
+        }
+
+        return 0;
+}
+
+#else
+#define s3c24xx_nand_suspend NULL
+#define s3c24xx_nand_resume NULL
+#endif
+
 /* driver device registration */
 
 static int s3c2410_nand_probe(struct platform_device *dev)
@@ -696,6 +710,8 @@ static int s3c2440_nand_probe(struct platform_device *dev)
 static struct platform_driver s3c2410_nand_driver = {
         .probe          = s3c2410_nand_probe,
         .remove         = s3c2410_nand_remove,
+        .suspend        = s3c24xx_nand_suspend,
+        .resume         = s3c24xx_nand_resume,
         .driver         = {
                 .name   = "s3c2410-nand",
                 .owner  = THIS_MODULE,
@@ -705,6 +721,8 @@ static struct platform_driver s3c2410_nand_driver = {
 static struct platform_driver s3c2440_nand_driver = {
         .probe          = s3c2440_nand_probe,
         .remove         = s3c2410_nand_remove,
+        .suspend        = s3c24xx_nand_suspend,
+        .resume         = s3c24xx_nand_resume,
         .driver         = {
                 .name   = "s3c2440-nand",
                 .owner  = THIS_MODULE,
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 1924a4f137c7..21743658d150 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -46,7 +46,6 @@ static int sharpsl_phys_base = 0x0C000000;
 #define FLCLE           (1 << 1)
 #define FLCE0           (1 << 0)
 
-
 /*
  * MTD structure for SharpSL
  */
@@ -60,50 +59,44 @@ static struct mtd_info *sharpsl_mtd = NULL;
 static int nr_partitions;
 static struct mtd_partition sharpsl_nand_default_partition_info[] = {
         {
-        .name = "System Area",
-        .offset = 0,
-        .size = 7 * 1024 * 1024,
-        },
+         .name = "System Area",
+         .offset = 0,
+         .size = 7 * 1024 * 1024,
+         },
         {
-        .name = "Root Filesystem",
-        .offset = 7 * 1024 * 1024,
-        .size = 30 * 1024 * 1024,
-        },
+         .name = "Root Filesystem",
+         .offset = 7 * 1024 * 1024,
+         .size = 30 * 1024 * 1024,
+         },
         {
-        .name = "Home Filesystem",
-        .offset = MTDPART_OFS_APPEND ,
-        .size = MTDPART_SIZ_FULL ,
-        },
+         .name = "Home Filesystem",
+         .offset = MTDPART_OFS_APPEND,
+         .size = MTDPART_SIZ_FULL,
+         },
 };
 
 /*
  *      hardware specific access to control-lines
+ *      ctrl:
+ *      NAND_CNE: bit 0 -> bit 0 & 4
+ *      NAND_CLE: bit 1 -> bit 1
+ *      NAND_ALE: bit 2 -> bit 2
+ *
  */
-static void
-sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd)
+static void sharpsl_nand_hwcontrol(struct mtd_info *mtd, int cmd,
+                                   unsigned int ctrl)
 {
-        switch (cmd) {
-        case NAND_CTL_SETCLE:
-                writeb(readb(FLASHCTL) | FLCLE, FLASHCTL);
-                break;
-        case NAND_CTL_CLRCLE:
-                writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL);
-                break;
-
-        case NAND_CTL_SETALE:
-                writeb(readb(FLASHCTL) | FLALE, FLASHCTL);
-                break;
-        case NAND_CTL_CLRALE:
-                writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL);
-                break;
-
-        case NAND_CTL_SETNCE:
-                writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL);
-                break;
-        case NAND_CTL_CLRNCE:
-                writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL);
-                break;
+        struct nand_chip *chip = mtd->priv;
+
+        if (ctrl & NAND_CTRL_CHANGE) {
+                unsigned char bits = ctrl & 0x07;
+
+                bits |= (ctrl & 0x01) << 4;
+                writeb((readb(FLASHCTL) & 0x17) | bits, FLASHCTL);
         }
+
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
 }
 
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
@@ -122,31 +115,26 @@ static struct nand_bbt_descr sharpsl_akita_bbt = {
         .pattern = scan_ff_pattern
 };
 
-static struct nand_oobinfo akita_oobinfo = {
-        .useecc = MTD_NANDECC_AUTOPLACE,
+static struct nand_ecclayout akita_oobinfo = {
         .eccbytes = 24,
         .eccpos = {
-                0x5,  0x1,  0x2,  0x3,  0x6,  0x7,  0x15, 0x11,
-                0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
-                0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
-        .oobfree = { {0x08, 0x09} }
+                   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
+                   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
+                   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
+        .oobfree = {{0x08, 0x09}}
 };
 
-static int
-sharpsl_nand_dev_ready(struct mtd_info* mtd)
+static int sharpsl_nand_dev_ready(struct mtd_info *mtd)
 {
         return !((readb(FLASHCTL) & FLRYBY) == 0);
 }
 
-static void
-sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode)
+static void sharpsl_nand_enable_hwecc(struct mtd_info *mtd, int mode)
 {
-        writeb(0 ,ECCCLRR);
+        writeb(0, ECCCLRR);
 }
 
-static int
-sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat,
-                                u_char* ecc_code)
+static int sharpsl_nand_calculate_ecc(struct mtd_info *mtd, const u_char * dat, u_char * ecc_code)
 {
         ecc_code[0] = ~readb(ECCLPUB);
         ecc_code[1] = ~readb(ECCLPLB);
@@ -154,47 +142,44 @@ sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat,
         return readb(ECCCNTR) != 0;
 }
 
-
 #ifdef CONFIG_MTD_PARTITIONS
 const char *part_probes[] = { "cmdlinepart", NULL };
 #endif
 
-
 /*
  * Main initialization routine
  */
-int __init
-sharpsl_nand_init(void)
+static int __init sharpsl_nand_init(void)
 {
         struct nand_chip *this;
-        struct mtd_partition* sharpsl_partition_info;
+        struct mtd_partition *sharpsl_partition_info;
         int err = 0;
 
         /* Allocate memory for MTD device structure and private data */
-        sharpsl_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip),
-                                GFP_KERNEL);
+        sharpsl_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!sharpsl_mtd) {
-                printk ("Unable to allocate SharpSL NAND MTD device structure.\n");
+                printk("Unable to allocate SharpSL NAND MTD device structure.\n");
                 return -ENOMEM;
         }
 
         /* map physical adress */
         sharpsl_io_base = ioremap(sharpsl_phys_base, 0x1000);
-        if(!sharpsl_io_base){
+        if (!sharpsl_io_base) {
                 printk("ioremap to access Sharp SL NAND chip failed\n");
                 kfree(sharpsl_mtd);
                 return -EIO;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&sharpsl_mtd[1]);
+        this = (struct nand_chip *)(&sharpsl_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) sharpsl_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(sharpsl_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         sharpsl_mtd->priv = this;
+        sharpsl_mtd->owner = THIS_MODULE;
 
         /*
          * PXA initialize
@@ -205,23 +190,25 @@ sharpsl_nand_init(void)
         this->IO_ADDR_R = FLASHIO;
         this->IO_ADDR_W = FLASHIO;
         /* Set address of hardware control function */
-        this->hwcontrol = sharpsl_nand_hwcontrol;
+        this->cmd_ctrl = sharpsl_nand_hwcontrol;
         this->dev_ready = sharpsl_nand_dev_ready;
         /* 15 us command delay time */
         this->chip_delay = 15;
         /* set eccmode using hardware ECC */
-        this->eccmode = NAND_ECC_HW3_256;
+        this->ecc.mode = NAND_ECC_HW;
+        this->ecc.size = 256;
+        this->ecc.bytes = 3;
         this->badblock_pattern = &sharpsl_bbt;
         if (machine_is_akita() || machine_is_borzoi()) {
                 this->badblock_pattern = &sharpsl_akita_bbt;
-                this->autooob = &akita_oobinfo;
+                this->ecc.layout = &akita_oobinfo;
         }
-        this->enable_hwecc = sharpsl_nand_enable_hwecc;
-        this->calculate_ecc = sharpsl_nand_calculate_ecc;
-        this->correct_data = nand_correct_data;
+        this->ecc.hwctl = sharpsl_nand_enable_hwecc;
+        this->ecc.calculate = sharpsl_nand_calculate_ecc;
+        this->ecc.correct = nand_correct_data;
 
         /* Scan to find existence of the device */
-        err=nand_scan(sharpsl_mtd,1);
+        err = nand_scan(sharpsl_mtd, 1);
         if (err) {
                 iounmap(sharpsl_io_base);
                 kfree(sharpsl_mtd);
@@ -230,24 +217,23 @@ sharpsl_nand_init(void)
 
         /* Register the partitions */
         sharpsl_mtd->name = "sharpsl-nand";
-        nr_partitions = parse_mtd_partitions(sharpsl_mtd, part_probes,
-                                                &sharpsl_partition_info, 0);
+        nr_partitions = parse_mtd_partitions(sharpsl_mtd, part_probes, &sharpsl_partition_info, 0);
 
         if (nr_partitions <= 0) {
                 nr_partitions = DEFAULT_NUM_PARTITIONS;
                 sharpsl_partition_info = sharpsl_nand_default_partition_info;
                 if (machine_is_poodle()) {
-                        sharpsl_partition_info[1].size=30 * 1024 * 1024;
+                        sharpsl_partition_info[1].size = 22 * 1024 * 1024;
                 } else if (machine_is_corgi() || machine_is_shepherd()) {
-                        sharpsl_partition_info[1].size=25 * 1024 * 1024;
+                        sharpsl_partition_info[1].size = 25 * 1024 * 1024;
                 } else if (machine_is_husky()) {
-                        sharpsl_partition_info[1].size=53 * 1024 * 1024;
+                        sharpsl_partition_info[1].size = 53 * 1024 * 1024;
                 } else if (machine_is_spitz()) {
-                        sharpsl_partition_info[1].size=5 * 1024 * 1024;
+                        sharpsl_partition_info[1].size = 5 * 1024 * 1024;
                 } else if (machine_is_akita()) {
-                        sharpsl_partition_info[1].size=58 * 1024 * 1024;
+                        sharpsl_partition_info[1].size = 58 * 1024 * 1024;
                 } else if (machine_is_borzoi()) {
-                        sharpsl_partition_info[1].size=32 * 1024 * 1024;
+                        sharpsl_partition_info[1].size = 32 * 1024 * 1024;
                 }
         }
 
@@ -261,15 +247,15 @@ sharpsl_nand_init(void)
         /* Return happy */
         return 0;
 }
+
 module_init(sharpsl_nand_init);
 
 /*
  * Clean up routine
  */
-#ifdef MODULE
 static void __exit sharpsl_nand_cleanup(void)
 {
-        struct nand_chip *this = (struct nand_chip *) &sharpsl_mtd[1];
+        struct nand_chip *this = (struct nand_chip *)&sharpsl_mtd[1];
 
         /* Release resources, unregister device */
         nand_release(sharpsl_mtd);
@@ -279,8 +265,8 @@ static void __exit sharpsl_nand_cleanup(void)
         /* Free the MTD device structure */
         kfree(sharpsl_mtd);
 }
+
 module_exit(sharpsl_nand_cleanup);
-#endif
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
diff --git a/drivers/mtd/nand/spia.c b/drivers/mtd/nand/spia.c
index 9cf1ce718ec1..1f6d429b1583 100644
--- a/drivers/mtd/nand/spia.c
+++ b/drivers/mtd/nand/spia.c
@@ -39,16 +39,16 @@ static struct mtd_info *spia_mtd = NULL;
  */
 #define SPIA_IO_BASE    0xd0000000      /* Start of EP7212 IO address space */
 #define SPIA_FIO_BASE   0xf0000000      /* Address where flash is mapped */
-#define SPIA_PEDR       0x0080          /*
-                                         * IO offset to Port E data register
-                                         * where the CLE, ALE and NCE pins
-                                         * are wired to.
-                                         */
-#define SPIA_PEDDR      0x00c0          /*
-                                         * IO offset to Port E data direction
-                                         * register so we can control the IO
-                                         * lines.
-                                         */
+#define SPIA_PEDR       0x0080  /*
+                                 * IO offset to Port E data register
+                                 * where the CLE, ALE and NCE pins
+                                 * are wired to.
+                                 */
+#define SPIA_PEDDR      0x00c0  /*
+                                 * IO offset to Port E data direction
+                                 * register so we can control the IO
+                                 * lines.
+                                 */
 
 /*
  * Module stuff
@@ -69,79 +69,84 @@ module_param(spia_peddr, int, 0);
  */
 static const struct mtd_partition partition_info[] = {
         {
-                .name   = "SPIA flash partition 1",
-                .offset = 0,
-                .size   = 2*1024*1024
-        },
+         .name = "SPIA flash partition 1",
+         .offset = 0,
+         .size = 2 * 1024 * 1024},
         {
-                .name   = "SPIA flash partition 2",
-                .offset = 2*1024*1024,
-                .size   = 6*1024*1024
-        }
+         .name = "SPIA flash partition 2",
+         .offset = 2 * 1024 * 1024,
+         .size = 6 * 1024 * 1024}
 };
-#define NUM_PARTITIONS 2
 
+#define NUM_PARTITIONS 2
 
 /*
  *      hardware specific access to control-lines
-*/
-static void spia_hwcontrol(struct mtd_info *mtd, int cmd){
-
-    switch(cmd){
+ *
+ *      ctrl:
+ *      NAND_CNE: bit 0 -> bit 2
+ *      NAND_CLE: bit 1 -> bit 0
+ *      NAND_ALE: bit 2 -> bit 1
+ */
+static void spia_hwcontrol(struct mtd_info *mtd, int cmd)
+{
+        struct nand_chip *chip = mtd->priv;
 
-        case NAND_CTL_SETCLE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) |=  0x01; break;
-        case NAND_CTL_CLRCLE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) &= ~0x01; break;
+        if (ctrl & NAND_CTRL_CHANGE) {
+                void __iomem *addr = spia_io_base + spia_pedr;
+                unsigned char bits;
 
-        case NAND_CTL_SETALE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) |=  0x02; break;
-        case NAND_CTL_CLRALE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) &= ~0x02; break;
+                bits = (ctrl & NAND_CNE) << 2;
+                bits |= (ctrl & NAND_CLE | NAND_ALE) >> 1;
+                writeb((readb(addr) & ~0x7) | bits, addr);
+        }
 
-        case NAND_CTL_SETNCE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) &= ~0x04; break;
-        case NAND_CTL_CLRNCE: (*(volatile unsigned char *) (spia_io_base + spia_pedr)) |=  0x04; break;
-    }
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
 }
 
 /*
  * Main initialization routine
  */
-int __init spia_init (void)
+static int __init spia_init(void)
 {
         struct nand_chip *this;
 
         /* Allocate memory for MTD device structure and private data */
-        spia_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),
-                                GFP_KERNEL);
+        spia_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!spia_mtd) {
-                printk ("Unable to allocate SPIA NAND MTD device structure.\n");
+                printk("Unable to allocate SPIA NAND MTD device structure.\n");
                 return -ENOMEM;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&spia_mtd[1]);
+        this = (struct nand_chip *)(&spia_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) spia_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(spia_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         spia_mtd->priv = this;
+        spia_mtd->owner = THIS_MODULE;
 
         /*
          * Set GPIO Port E control register so that the pins are configured
          * to be outputs for controlling the NAND flash.
          */
-        (*(volatile unsigned char *) (spia_io_base + spia_peddr)) = 0x07;
+        (*(volatile unsigned char *)(spia_io_base + spia_peddr)) = 0x07;
 
         /* Set address of NAND IO lines */
-        this->IO_ADDR_R = (void __iomem *) spia_fio_base;
-        this->IO_ADDR_W = (void __iomem *) spia_fio_base;
+        this->IO_ADDR_R = (void __iomem *)spia_fio_base;
+        this->IO_ADDR_W = (void __iomem *)spia_fio_base;
         /* Set address of hardware control function */
-        this->hwcontrol = spia_hwcontrol;
+        this->cmd_ctrl = spia_hwcontrol;
         /* 15 us command delay time */
         this->chip_delay = 15;
 
         /* Scan to find existence of the device */
-        if (nand_scan (spia_mtd, 1)) {
-                kfree (spia_mtd);
+        if (nand_scan(spia_mtd, 1)) {
+                kfree(spia_mtd);
                 return -ENXIO;
         }
 
@@ -151,22 +156,22 @@ int __init spia_init (void)
         /* Return happy */
         return 0;
 }
+
 module_init(spia_init);
 
 /*
  * Clean up routine
  */
-#ifdef MODULE
-static void __exit spia_cleanup (void)
+static void __exit spia_cleanup(void)
 {
         /* Release resources, unregister device */
-        nand_release (spia_mtd);
+        nand_release(spia_mtd);
 
         /* Free the MTD device structure */
-        kfree (spia_mtd);
+        kfree(spia_mtd);
 }
+
 module_exit(spia_cleanup);
-#endif
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Steven J. Hill <sjhill@realitydiluted.com");
diff --git a/drivers/mtd/nand/toto.c b/drivers/mtd/nand/toto.c
index 7609c43cb3ec..f9e2d4a0ab8c 100644
--- a/drivers/mtd/nand/toto.c
+++ b/drivers/mtd/nand/toto.c
@@ -32,6 +32,8 @@
 #include <asm/arch-omap1510/hardware.h>
 #include <asm/arch/gpio.h>
 
+#define CONFIG_NAND_WORKAROUND 1
+
 /*
  * MTD structure for TOTO board
  */
@@ -39,25 +41,6 @@ static struct mtd_info *toto_mtd = NULL;
 
 static unsigned long toto_io_base = OMAP_FLASH_1_BASE;
 
-#define CONFIG_NAND_WORKAROUND 1
-
-#define NAND_NCE 0x4000
-#define NAND_CLE 0x1000
-#define NAND_ALE 0x0002
-#define NAND_MASK (NAND_CLE | NAND_ALE | NAND_NCE)
-
-#define T_NAND_CTL_CLRALE(iob)  gpiosetout(NAND_ALE, 0)
-#define T_NAND_CTL_SETALE(iob)  gpiosetout(NAND_ALE, NAND_ALE)
-#ifdef CONFIG_NAND_WORKAROUND     /* "some" dev boards busted, blue wired to rts2 :( */
-#define T_NAND_CTL_CLRCLE(iob)  gpiosetout(NAND_CLE, 0); rts2setout(2, 2)
-#define T_NAND_CTL_SETCLE(iob)  gpiosetout(NAND_CLE, NAND_CLE); rts2setout(2, 0)
-#else
-#define T_NAND_CTL_CLRCLE(iob)  gpiosetout(NAND_CLE, 0)
-#define T_NAND_CTL_SETCLE(iob)  gpiosetout(NAND_CLE, NAND_CLE)
-#endif
-#define T_NAND_CTL_SETNCE(iob)  gpiosetout(NAND_NCE, 0)
-#define T_NAND_CTL_CLRNCE(iob)  gpiosetout(NAND_NCE, NAND_NCE)
-
 /*
  * Define partitions for flash devices
  */
@@ -91,91 +74,110 @@ static struct mtd_partition partition_info32M[] = {
 
 #define NUM_PARTITIONS32M 3
 #define NUM_PARTITIONS64M 4
+
 /*
  *      hardware specific access to control-lines
-*/
-
-static void toto_hwcontrol(struct mtd_info *mtd, int cmd)
+ *
+ *      ctrl:
+ *      NAND_NCE: bit 0 -> bit 14 (0x4000)
+ *      NAND_CLE: bit 1 -> bit 12 (0x1000)
+ *      NAND_ALE: bit 2 -> bit 1  (0x0002)
+ */
+static void toto_hwcontrol(struct mtd_info *mtd, int cmd,
+                           unsigned int ctrl)
 {
+        struct nand_chip *chip = mtd->priv;
+
+        if (ctrl & NAND_CTRL_CHANGE) {
+                unsigned long bits;
 
-        udelay(1); /* hopefully enough time for tc make proceding write to clear */
-        switch(cmd){
+                /* hopefully enough time for tc make proceding write to clear */
+                udelay(1);
 
-                case NAND_CTL_SETCLE: T_NAND_CTL_SETCLE(cmd); break;
-                case NAND_CTL_CLRCLE: T_NAND_CTL_CLRCLE(cmd); break;
+                bits = (~ctrl & NAND_NCE) << 14;
+                bits |= (ctrl & NAND_CLE) << 12;
+                bits |= (ctrl & NAND_ALE) >> 1;
 
-                case NAND_CTL_SETALE: T_NAND_CTL_SETALE(cmd); break;
-                case NAND_CTL_CLRALE: T_NAND_CTL_CLRALE(cmd); break;
+#warning Wild guess as gpiosetout() is nowhere defined in the kernel source - tglx
+                gpiosetout(0x5002, bits);
 
-                case NAND_CTL_SETNCE: T_NAND_CTL_SETNCE(cmd); break;
-                case NAND_CTL_CLRNCE: T_NAND_CTL_CLRNCE(cmd); break;
+#ifdef CONFIG_NAND_WORKAROUND
+                /* "some" dev boards busted, blue wired to rts2 :( */
+                rts2setout(2, (ctrl & NAND_CLE) << 1);
+#endif
+                /* allow time to ensure gpio state to over take memory write */
+                udelay(1);
         }
-        udelay(1); /* allow time to ensure gpio state to over take memory write */
+
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
 }
 
 /*
  * Main initialization routine
  */
-int __init toto_init (void)
+static int __init toto_init(void)
 {
         struct nand_chip *this;
         int err = 0;
 
         /* Allocate memory for MTD device structure and private data */
-        toto_mtd = kmalloc (sizeof(struct mtd_info) + sizeof (struct nand_chip),
-                                GFP_KERNEL);
+        toto_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
         if (!toto_mtd) {
-                printk (KERN_WARNING "Unable to allocate toto NAND MTD device structure.\n");
+                printk(KERN_WARNING "Unable to allocate toto NAND MTD device structure.\n");
                 err = -ENOMEM;
                 goto out;
         }
 
         /* Get pointer to private data */
-        this = (struct nand_chip *) (&toto_mtd[1]);
+        this = (struct nand_chip *)(&toto_mtd[1]);
 
         /* Initialize structures */
-        memset((char *) toto_mtd, 0, sizeof(struct mtd_info));
-        memset((char *) this, 0, sizeof(struct nand_chip));
+        memset(toto_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
 
         /* Link the private data with the MTD structure */
         toto_mtd->priv = this;
+        toto_mtd->owner = THIS_MODULE;
 
         /* Set address of NAND IO lines */
         this->IO_ADDR_R = toto_io_base;
         this->IO_ADDR_W = toto_io_base;
-        this->hwcontrol = toto_hwcontrol;
+        this->cmd_ctrl = toto_hwcontrol;
         this->dev_ready = NULL;
         /* 25 us command delay time */
         this->chip_delay = 30;
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
 
-        /* Scan to find existance of the device */
-        if (nand_scan (toto_mtd, 1)) {
+        /* Scan to find existance of the device */
+        if (nand_scan(toto_mtd, 1)) {
                 err = -ENXIO;
                 goto out_mtd;
         }
 
         /* Register the partitions */
-        switch(toto_mtd->size){
-                case SZ_64M: add_mtd_partitions(toto_mtd, partition_info64M, NUM_PARTITIONS64M); break;
-                case SZ_32M: add_mtd_partitions(toto_mtd, partition_info32M, NUM_PARTITIONS32M); break;
-                default: {
-                        printk (KERN_WARNING "Unsupported Nand device\n");
+        switch (toto_mtd->size) {
+        case SZ_64M:
+                add_mtd_partitions(toto_mtd, partition_info64M, NUM_PARTITIONS64M);
+                break;
+        case SZ_32M:
+                add_mtd_partitions(toto_mtd, partition_info32M, NUM_PARTITIONS32M);
+                break;
+        default:{
+                        printk(KERN_WARNING "Unsupported Nand device\n");
                         err = -ENXIO;
                         goto out_buf;
                 }
         }
 
-        gpioreserve(NAND_MASK);  /* claim our gpios */
-        archflashwp(0,0);        /* open up flash for writing */
+        gpioreserve(NAND_MASK); /* claim our gpios */
+        archflashwp(0, 0);      /* open up flash for writing */
 
         goto out;
 
-out_buf:
-        kfree (this->data_buf);
-out_mtd:
-        kfree (toto_mtd);
-out:
+ out_mtd:
+        kfree(toto_mtd);
+ out:
         return err;
 }
 
@@ -184,20 +186,21 @@ module_init(toto_init);
 /*
  * Clean up routine
  */
-static void __exit toto_cleanup (void)
+static void __exit toto_cleanup(void)
 {
         /* Release resources, unregister device */
-        nand_release (toto_mtd);
+        nand_release(toto_mtd);
 
         /* Free the MTD device structure */
-        kfree (toto_mtd);
+        kfree(toto_mtd);
 
         /* stop flash writes */
-         archflashwp(0,1);
+        archflashwp(0, 1);
 
         /* release gpios to system */
-         gpiorelease(NAND_MASK);
+        gpiorelease(NAND_MASK);
 }
+
 module_exit(toto_cleanup);
 
 MODULE_LICENSE("GPL");
diff --git a/drivers/mtd/nand/ts7250.c b/drivers/mtd/nand/ts7250.c
new file mode 100644
index 000000000000..a0b4b1edcb0d
--- /dev/null
+++ b/drivers/mtd/nand/ts7250.c
@@ -0,0 +1,206 @@
+/*
+ * drivers/mtd/nand/ts7250.c
+ *
+ * Copyright (C) 2004 Technologic Systems (support@embeddedARM.com)
+ *
+ * Derived from drivers/mtd/nand/edb7312.c
+ *   Copyright (C) 2004 Marius Gröger (mag@sysgo.de)
+ *
+ * Derived from drivers/mtd/nand/autcpu12.c
+ *   Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
+ *
+ * $Id: ts7250.c,v 1.4 2004/12/30 22:02:07 joff Exp $
+ *
+ * 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.
+ *
+ * Overview:
+ *   This is a device driver for the NAND flash device found on the
+ *   TS-7250 board which utilizes a Samsung 32 Mbyte part.
+ */
+
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+#include <asm/arch/hardware.h>
+#include <asm/sizes.h>
+#include <asm/mach-types.h>
+
+/*
+ * MTD structure for TS7250 board
+ */
+static struct mtd_info *ts7250_mtd = NULL;
+
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probes[] = { "cmdlinepart", NULL };
+
+#define NUM_PARTITIONS 3
+
+/*
+ * Define static partitions for flash device
+ */
+static struct mtd_partition partition_info32[] = {
+        {
+                .name           = "TS-BOOTROM",
+                .offset         = 0x00000000,
+                .size           = 0x00004000,
+        }, {
+                .name           = "Linux",
+                .offset         = 0x00004000,
+                .size           = 0x01d00000,
+        }, {
+                .name           = "RedBoot",
+                .offset         = 0x01d04000,
+                .size           = 0x002fc000,
+        },
+};
+
+/*
+ * Define static partitions for flash device
+ */
+static struct mtd_partition partition_info128[] = {
+        {
+                .name           = "TS-BOOTROM",
+                .offset         = 0x00000000,
+                .size           = 0x00004000,
+        }, {
+                .name           = "Linux",
+                .offset         = 0x00004000,
+                .size           = 0x07d00000,
+        }, {
+                .name           = "RedBoot",
+                .offset         = 0x07d04000,
+                .size           = 0x002fc000,
+        },
+};
+#endif
+
+
+/*
+ *      hardware specific access to control-lines
+ *
+ *      ctrl:
+ *      NAND_NCE: bit 0 -> bit 2
+ *      NAND_CLE: bit 1 -> bit 1
+ *      NAND_ALE: bit 2 -> bit 0
+ */
+static void ts7250_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+        struct nand_chip *chip = mtd->priv;
+
+        if (ctrl & NAND_CTRL_CHANGE) {
+                unsigned long addr = TS72XX_NAND_CONTROL_VIRT_BASE;
+                unsigned char bits;
+
+                bits = (ctrl & NAND_CNE) << 2;
+                bits |= ctrl & NAND_CLE;
+                bits |= (ctrl & NAND_ALE) >> 2;
+
+                __raw_writeb((__raw_readb(addr) & ~0x7) | bits, addr);
+        }
+
+        if (cmd != NAND_CMD_NONE)
+                writeb(cmd, chip->IO_ADDR_W);
+}
+
+/*
+ *      read device ready pin
+ */
+static int ts7250_device_ready(struct mtd_info *mtd)
+{
+        return __raw_readb(TS72XX_NAND_BUSY_VIRT_BASE) & 0x20;
+}
+
+/*
+ * Main initialization routine
+ */
+static int __init ts7250_init(void)
+{
+        struct nand_chip *this;
+        const char *part_type = 0;
+        int mtd_parts_nb = 0;
+        struct mtd_partition *mtd_parts = 0;
+
+        if (!machine_is_ts72xx() || board_is_ts7200())
+                return -ENXIO;
+
+        /* Allocate memory for MTD device structure and private data */
+        ts7250_mtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip), GFP_KERNEL);
+        if (!ts7250_mtd) {
+                printk("Unable to allocate TS7250 NAND MTD device structure.\n");
+                return -ENOMEM;
+        }
+
+        /* Get pointer to private data */
+        this = (struct nand_chip *)(&ts7250_mtd[1]);
+
+        /* Initialize structures */
+        memset(ts7250_mtd, 0, sizeof(struct mtd_info));
+        memset(this, 0, sizeof(struct nand_chip));
+
+        /* Link the private data with the MTD structure */
+        ts7250_mtd->priv = this;
+        ts7250_mtd->owner = THIS_MODULE;
+
+        /* insert callbacks */
+        this->IO_ADDR_R = (void *)TS72XX_NAND_DATA_VIRT_BASE;
+        this->IO_ADDR_W = (void *)TS72XX_NAND_DATA_VIRT_BASE;
+        this->cmd_ctrl = ts7250_hwcontrol;
+        this->dev_ready = ts7250_device_ready;
+        this->chip_delay = 15;
+        this->ecc.mode = NAND_ECC_SOFT;
+
+        printk("Searching for NAND flash...\n");
+        /* Scan to find existence of the device */
+        if (nand_scan(ts7250_mtd, 1)) {
+                kfree(ts7250_mtd);
+                return -ENXIO;
+        }
+#ifdef CONFIG_MTD_PARTITIONS
+        ts7250_mtd->name = "ts7250-nand";
+        mtd_parts_nb = parse_mtd_partitions(ts7250_mtd, part_probes, &mtd_parts, 0);
+        if (mtd_parts_nb > 0)
+                part_type = "command line";
+        else
+                mtd_parts_nb = 0;
+#endif
+        if (mtd_parts_nb == 0) {
+                mtd_parts = partition_info32;
+                if (ts7250_mtd->size >= (128 * 0x100000))
+                        mtd_parts = partition_info128;
+                mtd_parts_nb = NUM_PARTITIONS;
+                part_type = "static";
+        }
+
+        /* Register the partitions */
+        printk(KERN_NOTICE "Using %s partition definition\n", part_type);
+        add_mtd_partitions(ts7250_mtd, mtd_parts, mtd_parts_nb);
+
+        /* Return happy */
+        return 0;
+}
+
+module_init(ts7250_init);
+
+/*
+ * Clean up routine
+ */
+static void __exit ts7250_cleanup(void)
+{
+        /* Unregister the device */
+        del_mtd_device(ts7250_mtd);
+
+        /* Free the MTD device structure */
+        kfree(ts7250_mtd);
+}
+
+module_exit(ts7250_cleanup);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Jesse Off <joff@embeddedARM.com>");
+MODULE_DESCRIPTION("MTD map driver for Technologic Systems TS-7250 board");
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index d7cd5fa16ba4..dc7573501d8c 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -70,8 +70,6 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
         nftl->mbd.devnum = -1;
         nftl->mbd.blksize = 512;
         nftl->mbd.tr = tr;
-        memcpy(&nftl->oobinfo, &mtd->oobinfo, sizeof(struct nand_oobinfo));
-        nftl->oobinfo.useecc = MTD_NANDECC_PLACEONLY;
 
         if (NFTL_mount(nftl) < 0) {
                 printk(KERN_WARNING "NFTL: could not mount device\n");
@@ -136,6 +134,69 @@ static void nftl_remove_dev(struct mtd_blktrans_dev *dev)
         kfree(nftl);
 }
 
+/*
+ * Read oob data from flash
+ */
+int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                  size_t *retlen, uint8_t *buf)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs & (mtd->writesize - 1);
+        ops.ooblen = len;
+        ops.oobbuf = buf;
+        ops.datbuf = NULL;
+        ops.len = len;
+
+        res = mtd->read_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
+/*
+ * Write oob data to flash
+ */
+int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                   size_t *retlen, uint8_t *buf)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs & (mtd->writesize - 1);
+        ops.ooblen = len;
+        ops.oobbuf = buf;
+        ops.datbuf = NULL;
+        ops.len = len;
+
+        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
+/*
+ * Write data and oob to flash
+ */
+static int nftl_write(struct mtd_info *mtd, loff_t offs, size_t len,
+                      size_t *retlen, uint8_t *buf, uint8_t *oob)
+{
+        struct mtd_oob_ops ops;
+        int res;
+
+        ops.mode = MTD_OOB_PLACE;
+        ops.ooboffs = offs;
+        ops.ooblen = mtd->oobsize;
+        ops.oobbuf = oob;
+        ops.datbuf = buf;
+        ops.len = len;
+
+        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
+        *retlen = ops.retlen;
+        return res;
+}
+
 #ifdef CONFIG_NFTL_RW
 
 /* Actual NFTL access routines */
@@ -185,6 +246,7 @@ static u16 NFTL_findfreeblock(struct NFTLrecord *nftl, int desperate )
 
 static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned pendingblock )
 {
+        struct mtd_info *mtd = nftl->mbd.mtd;
         u16 BlockMap[MAX_SECTORS_PER_UNIT];
         unsigned char BlockLastState[MAX_SECTORS_PER_UNIT];
         unsigned char BlockFreeFound[MAX_SECTORS_PER_UNIT];
@@ -194,7 +256,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
         unsigned int targetEUN;
         struct nftl_oob oob;
         int inplace = 1;
-        size_t retlen;
+        size_t retlen;
 
         memset(BlockMap, 0xff, sizeof(BlockMap));
         memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
@@ -210,21 +272,21 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
         /* Scan to find the Erase Unit which holds the actual data for each
            512-byte block within the Chain.
         */
-        silly = MAX_LOOPS;
+        silly = MAX_LOOPS;
         targetEUN = BLOCK_NIL;
         while (thisEUN <= nftl->lastEUN ) {
-                unsigned int status, foldmark;
+                unsigned int status, foldmark;
 
                 targetEUN = thisEUN;
                 for (block = 0; block < nftl->EraseSize / 512; block ++) {
-                        MTD_READOOB(nftl->mbd.mtd,
-                                    (thisEUN * nftl->EraseSize) + (block * 512),
-                                    16 , &retlen, (char *)&oob);
+                        nftl_read_oob(mtd, (thisEUN * nftl->EraseSize) +
+                                      (block * 512), 16 , &retlen,
+                                      (char *)&oob);
                         if (block == 2) {
-                                foldmark = oob.u.c.FoldMark | oob.u.c.FoldMark1;
-                                if (foldmark == FOLD_MARK_IN_PROGRESS) {
-                                        DEBUG(MTD_DEBUG_LEVEL1,
-                                              "Write Inhibited on EUN %d\n", thisEUN);
+                                foldmark = oob.u.c.FoldMark | oob.u.c.FoldMark1;
+                                if (foldmark == FOLD_MARK_IN_PROGRESS) {
+                                        DEBUG(MTD_DEBUG_LEVEL1,
+                                              "Write Inhibited on EUN %d\n", thisEUN);
                                         inplace = 0;
                                 } else {
                                         /* There's no other reason not to do inplace,
@@ -233,7 +295,7 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                                         inplace = 1;
                                 }
                         }
-                        status = oob.b.Status | oob.b.Status1;
+                        status = oob.b.Status | oob.b.Status1;
                         BlockLastState[block] = status;
 
                         switch(status) {
@@ -328,15 +390,15 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                         return BLOCK_NIL;
                 }
         } else {
-            /* We put a fold mark in the chain we are folding only if
-               we fold in place to help the mount check code. If we do
-               not fold in place, it is possible to find the valid
-               chain by selecting the longer one */
-            oob.u.c.FoldMark = oob.u.c.FoldMark1 = cpu_to_le16(FOLD_MARK_IN_PROGRESS);
-            oob.u.c.unused = 0xffffffff;
-            MTD_WRITEOOB(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + 2 * 512 + 8,
-                         8, &retlen, (char *)&oob.u);
-        }
+                /* We put a fold mark in the chain we are folding only if we
+               fold in place to help the mount check code. If we do not fold in
+               place, it is possible to find the valid chain by selecting the
+               longer one */
+                oob.u.c.FoldMark = oob.u.c.FoldMark1 = cpu_to_le16(FOLD_MARK_IN_PROGRESS);
+                oob.u.c.unused = 0xffffffff;
+                nftl_write_oob(mtd, (nftl->EraseSize * targetEUN) + 2 * 512 + 8,
+                               8, &retlen, (char *)&oob.u);
+        }
 
         /* OK. We now know the location of every block in the Virtual Unit Chain,
            and the Erase Unit into which we are supposed to be copying.
@@ -353,33 +415,33 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
                         continue;
                 }
 
-                /* copy only in non free block (free blocks can only
+                /* copy only in non free block (free blocks can only
                    happen in case of media errors or deleted blocks) */
-                if (BlockMap[block] == BLOCK_NIL)
-                        continue;
-
-                ret = MTD_READ(nftl->mbd.mtd, (nftl->EraseSize * BlockMap[block]) + (block * 512),
-                                  512, &retlen, movebuf);
-                if (ret < 0) {
-                    ret = MTD_READ(nftl->mbd.mtd, (nftl->EraseSize * BlockMap[block])
-                                      + (block * 512), 512, &retlen,
-                                      movebuf);
-                    if (ret != -EIO)
-                        printk("Error went away on retry.\n");
-                }
+                if (BlockMap[block] == BLOCK_NIL)
+                        continue;
+
+                ret = mtd->read(mtd, (nftl->EraseSize * BlockMap[block]) + (block * 512),
+                                512, &retlen, movebuf);
+                if (ret < 0 && ret != -EUCLEAN) {
+                        ret = mtd->read(mtd, (nftl->EraseSize * BlockMap[block])
+                                        + (block * 512), 512, &retlen,
+                                        movebuf);
+                        if (ret != -EIO)
+                                printk("Error went away on retry.\n");
+                }
                 memset(&oob, 0xff, sizeof(struct nftl_oob));
                 oob.b.Status = oob.b.Status1 = SECTOR_USED;
-                MTD_WRITEECC(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + (block * 512),
-                             512, &retlen, movebuf, (char *)&oob, &nftl->oobinfo);
+
+                nftl_write(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) +
+                           (block * 512), 512, &retlen, movebuf, (char *)&oob);
         }
 
-        /* add the header so that it is now a valid chain */
-        oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum
-                = cpu_to_le16(thisVUC);
-        oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum = 0xffff;
+        /* add the header so that it is now a valid chain */
+        oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum = cpu_to_le16(thisVUC);
+        oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum = 0xffff;
 
-        MTD_WRITEOOB(nftl->mbd.mtd, (nftl->EraseSize * targetEUN) + 8,
-                     8, &retlen, (char *)&oob.u);
+        nftl_write_oob(mtd, (nftl->EraseSize * targetEUN) + 8,
+                       8, &retlen, (char *)&oob.u);
 
         /* OK. We've moved the whole lot into the new block. Now we have to free the original blocks. */
 
@@ -396,18 +458,18 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
         while (thisEUN <= nftl->lastEUN && thisEUN != targetEUN) {
                 unsigned int EUNtmp;
 
-                EUNtmp = nftl->ReplUnitTable[thisEUN];
+                EUNtmp = nftl->ReplUnitTable[thisEUN];
 
-                if (NFTL_formatblock(nftl, thisEUN) < 0) {
+                if (NFTL_formatblock(nftl, thisEUN) < 0) {
                         /* could not erase : mark block as reserved
                          */
                         nftl->ReplUnitTable[thisEUN] = BLOCK_RESERVED;
-                } else {
+                } else {
                         /* correctly erased : mark it as free */
                         nftl->ReplUnitTable[thisEUN] = BLOCK_FREE;
                         nftl->numfreeEUNs++;
-                }
-                thisEUN = EUNtmp;
+                }
+                thisEUN = EUNtmp;
         }
 
         /* Make this the new start of chain for thisVUC */
@@ -473,6 +535,7 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
 {
         u16 lastEUN;
         u16 thisVUC = block / (nftl->EraseSize / 512);
+        struct mtd_info *mtd = nftl->mbd.mtd;
         unsigned int writeEUN;
         unsigned long blockofs = (block * 512) & (nftl->EraseSize -1);
         size_t retlen;
@@ -489,21 +552,22 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                 */
                 lastEUN = BLOCK_NIL;
                 writeEUN = nftl->EUNtable[thisVUC];
-                silly = MAX_LOOPS;
+                silly = MAX_LOOPS;
                 while (writeEUN <= nftl->lastEUN) {
                         struct nftl_bci bci;
                         size_t retlen;
-                        unsigned int status;
+                        unsigned int status;
 
                         lastEUN = writeEUN;
 
-                        MTD_READOOB(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) + blockofs,
-                                    8, &retlen, (char *)&bci);
+                        nftl_read_oob(mtd,
+                                      (writeEUN * nftl->EraseSize) + blockofs,
+                                      8, &retlen, (char *)&bci);
 
                         DEBUG(MTD_DEBUG_LEVEL2, "Status of block %d in EUN %d is %x\n",
                               block , writeEUN, le16_to_cpu(bci.Status));
 
-                        status = bci.Status | bci.Status1;
+                        status = bci.Status | bci.Status1;
                         switch(status) {
                         case SECTOR_FREE:
                                 return writeEUN;
@@ -574,10 +638,10 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                 /* We've found a free block. Insert it into the chain. */
 
                 if (lastEUN != BLOCK_NIL) {
-                    thisVUC |= 0x8000; /* It's a replacement block */
+                        thisVUC |= 0x8000; /* It's a replacement block */
                 } else {
-                    /* The first block in a new chain */
-                    nftl->EUNtable[thisVUC] = writeEUN;
+                        /* The first block in a new chain */
+                        nftl->EUNtable[thisVUC] = writeEUN;
                 }
 
                 /* set up the actual EUN we're writing into */
@@ -585,29 +649,29 @@ static inline u16 NFTL_findwriteunit(struct NFTLrecord *nftl, unsigned block)
                 nftl->ReplUnitTable[writeEUN] = BLOCK_NIL;
 
                 /* ... and on the flash itself */
-                MTD_READOOB(nftl->mbd.mtd, writeEUN * nftl->EraseSize + 8, 8,
-                            &retlen, (char *)&oob.u);
+                nftl_read_oob(mtd, writeEUN * nftl->EraseSize + 8, 8,
+                              &retlen, (char *)&oob.u);
 
                 oob.u.a.VirtUnitNum = oob.u.a.SpareVirtUnitNum = cpu_to_le16(thisVUC);
 
-                MTD_WRITEOOB(nftl->mbd.mtd, writeEUN * nftl->EraseSize + 8, 8,
-                             &retlen, (char *)&oob.u);
+                nftl_write_oob(mtd, writeEUN * nftl->EraseSize + 8, 8,
+                               &retlen, (char *)&oob.u);
 
-                /* we link the new block to the chain only after the
+                /* we link the new block to the chain only after the
                    block is ready. It avoids the case where the chain
                    could point to a free block */
-                if (lastEUN != BLOCK_NIL) {
+                if (lastEUN != BLOCK_NIL) {
                         /* Both in our cache... */
                         nftl->ReplUnitTable[lastEUN] = writeEUN;
                         /* ... and on the flash itself */
-                        MTD_READOOB(nftl->mbd.mtd, (lastEUN * nftl->EraseSize) + 8,
-                                    8, &retlen, (char *)&oob.u);
+                        nftl_read_oob(mtd, (lastEUN * nftl->EraseSize) + 8,
+                                      8, &retlen, (char *)&oob.u);
 
                         oob.u.a.ReplUnitNum = oob.u.a.SpareReplUnitNum
                                 = cpu_to_le16(writeEUN);
 
-                        MTD_WRITEOOB(nftl->mbd.mtd, (lastEUN * nftl->EraseSize) + 8,
-                                     8, &retlen, (char *)&oob.u);
+                        nftl_write_oob(mtd, (lastEUN * nftl->EraseSize) + 8,
+                                       8, &retlen, (char *)&oob.u);
                 }
 
                 return writeEUN;
@@ -639,10 +703,9 @@ static int nftl_writeblock(struct mtd_blktrans_dev *mbd, unsigned long block,
 
         memset(&oob, 0xff, sizeof(struct nftl_oob));
         oob.b.Status = oob.b.Status1 = SECTOR_USED;
-        MTD_WRITEECC(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) + blockofs,
-                     512, &retlen, (char *)buffer, (char *)&oob, &nftl->oobinfo);
-        /* need to write SECTOR_USED flags since they are not written in mtd_writeecc */
 
+        nftl_write(nftl->mbd.mtd, (writeEUN * nftl->EraseSize) + blockofs,
+                   512, &retlen, (char *)buffer, (char *)&oob);
         return 0;
 }
 #endif /* CONFIG_NFTL_RW */
@@ -651,20 +714,22 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,
                           char *buffer)
 {
         struct NFTLrecord *nftl = (void *)mbd;
+        struct mtd_info *mtd = nftl->mbd.mtd;
         u16 lastgoodEUN;
         u16 thisEUN = nftl->EUNtable[block / (nftl->EraseSize / 512)];
         unsigned long blockofs = (block * 512) & (nftl->EraseSize - 1);
-        unsigned int status;
+        unsigned int status;
         int silly = MAX_LOOPS;
-        size_t retlen;
-        struct nftl_bci bci;
+        size_t retlen;
+        struct nftl_bci bci;
 
         lastgoodEUN = BLOCK_NIL;
 
-        if (thisEUN != BLOCK_NIL) {
+        if (thisEUN != BLOCK_NIL) {
                 while (thisEUN < nftl->nb_blocks) {
-                        if (MTD_READOOB(nftl->mbd.mtd, (thisEUN * nftl->EraseSize) + blockofs,
-                                        8, &retlen, (char *)&bci) < 0)
+                        if (nftl_read_oob(mtd, (thisEUN * nftl->EraseSize) +
+                                          blockofs, 8, &retlen,
+                                          (char *)&bci) < 0)
                                 status = SECTOR_IGNORE;
                         else
                                 status = bci.Status | bci.Status1;
@@ -694,7 +759,7 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,
                         }
                         thisEUN = nftl->ReplUnitTable[thisEUN];
                 }
-        }
+        }
 
  the_end:
         if (lastgoodEUN == BLOCK_NIL) {
@@ -703,7 +768,9 @@ static int nftl_readblock(struct mtd_blktrans_dev *mbd, unsigned long block,
         } else {
                 loff_t ptr = (lastgoodEUN * nftl->EraseSize) + blockofs;
                 size_t retlen;
-                if (MTD_READ(nftl->mbd.mtd, ptr, 512, &retlen, buffer))
+                int res = mtd->read(mtd, ptr, 512, &retlen, buffer);
+
+                if (res < 0 && res != -EUCLEAN)
                         return -EIO;
         }
         return 0;
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index 3b104ebb219a..067262ee8df0 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -33,6 +33,11 @@
 
 char nftlmountrev[]="$Revision: 1.41 $";
 
+extern int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                         size_t *retlen, uint8_t *buf);
+extern int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
+                          size_t *retlen, uint8_t *buf);
+
 /* find_boot_record: Find the NFTL Media Header and its Spare copy which contains the
  *      various device information of the NFTL partition and Bad Unit Table. Update
  *      the ReplUnitTable[] table accroding to the Bad Unit Table. ReplUnitTable[]
@@ -45,6 +50,7 @@ static int find_boot_record(struct NFTLrecord *nftl)
         size_t retlen;
         u8 buf[SECTORSIZE];
         struct NFTLMediaHeader *mh = &nftl->MediaHdr;
+        struct mtd_info *mtd = nftl->mbd.mtd;
         unsigned int i;
 
         /* Assume logical EraseSize == physical erasesize for starting the scan.
@@ -65,7 +71,8 @@ static int find_boot_record(struct NFTLrecord *nftl)
 
                 /* Check for ANAND header first. Then can whinge if it's found but later
                    checks fail */
-                ret = MTD_READ(nftl->mbd.mtd, block * nftl->EraseSize, SECTORSIZE, &retlen, buf);
+                ret = mtd->read(mtd, block * nftl->EraseSize, SECTORSIZE,
+                                &retlen, buf);
                 /* We ignore ret in case the ECC of the MediaHeader is invalid
                    (which is apparently acceptable) */
                 if (retlen != SECTORSIZE) {
@@ -90,8 +97,9 @@ static int find_boot_record(struct NFTLrecord *nftl)
                 }
 
                 /* To be safer with BIOS, also use erase mark as discriminant */
-                if ((ret = MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8,
-                                8, &retlen, (char *)&h1) < 0)) {
+                if ((ret = nftl_read_oob(mtd, block * nftl->EraseSize +
+                                         SECTORSIZE + 8, 8, &retlen,
+                                         (char *)&h1) < 0)) {
                         printk(KERN_WARNING "ANAND header found at 0x%x in mtd%d, but OOB data read failed (err %d)\n",
                                block * nftl->EraseSize, nftl->mbd.mtd->index, ret);
                         continue;
@@ -109,8 +117,8 @@ static int find_boot_record(struct NFTLrecord *nftl)
                 }
 
                 /* Finally reread to check ECC */
-                if ((ret = MTD_READECC(nftl->mbd.mtd, block * nftl->EraseSize, SECTORSIZE,
-                                &retlen, buf, (char *)&oob, NULL) < 0)) {
+                if ((ret = mtd->read(mtd, block * nftl->EraseSize, SECTORSIZE,
+                                     &retlen, buf) < 0)) {
                         printk(KERN_NOTICE "ANAND header found at 0x%x in mtd%d, but ECC read failed (err %d)\n",
                                block * nftl->EraseSize, nftl->mbd.mtd->index, ret);
                         continue;
@@ -228,9 +236,9 @@ device is already correct.
 The new DiskOnChip driver already scanned the bad block table.  Just query it.
                         if ((i & (SECTORSIZE - 1)) == 0) {
                                 /* read one sector for every SECTORSIZE of blocks */
-                                if ((ret = MTD_READECC(nftl->mbd.mtd, block * nftl->EraseSize +
-                                                       i + SECTORSIZE, SECTORSIZE, &retlen, buf,
-                                                       (char *)&oob, NULL)) < 0) {
+                                if ((ret = mtd->read(nftl->mbd.mtd, block * nftl->EraseSize +
+                                                     i + SECTORSIZE, SECTORSIZE, &retlen,
+                                                     buf)) < 0) {
                                         printk(KERN_NOTICE "Read of bad sector table failed (err %d)\n",
                                                ret);
                                         kfree(nftl->ReplUnitTable);
@@ -268,18 +276,22 @@ static int memcmpb(void *a, int c, int n)
 static int check_free_sectors(struct NFTLrecord *nftl, unsigned int address, int len,
                               int check_oob)
 {
-        int i;
-        size_t retlen;
         u8 buf[SECTORSIZE + nftl->mbd.mtd->oobsize];
+        struct mtd_info *mtd = nftl->mbd.mtd;
+        size_t retlen;
+        int i;
 
         for (i = 0; i < len; i += SECTORSIZE) {
-                if (MTD_READECC(nftl->mbd.mtd, address, SECTORSIZE, &retlen, buf, &buf[SECTORSIZE], &nftl->oobinfo) < 0)
+                if (mtd->read(mtd, address, SECTORSIZE, &retlen, buf))
                         return -1;
                 if (memcmpb(buf, 0xff, SECTORSIZE) != 0)
                         return -1;
 
                 if (check_oob) {
-                        if (memcmpb(buf + SECTORSIZE, 0xff, nftl->mbd.mtd->oobsize) != 0)
+                        if(nftl_read_oob(mtd, address, mtd->oobsize,
+                                         &retlen, &buf[SECTORSIZE]) < 0)
+                                return -1;
+                        if (memcmpb(buf + SECTORSIZE, 0xff, mtd->oobsize) != 0)
                                 return -1;
                 }
                 address += SECTORSIZE;
@@ -301,10 +313,11 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)
         unsigned int nb_erases, erase_mark;
         struct nftl_uci1 uci;
         struct erase_info *instr = &nftl->instr;
+        struct mtd_info *mtd = nftl->mbd.mtd;
 
         /* Read the Unit Control Information #1 for Wear-Leveling */
-        if (MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8,
-                        8, &retlen, (char *)&uci) < 0)
+        if (nftl_read_oob(mtd, block * nftl->EraseSize + SECTORSIZE + 8,
+                          8, &retlen, (char *)&uci) < 0)
                 goto default_uci1;
 
         erase_mark = le16_to_cpu ((uci.EraseMark | uci.EraseMark1));
@@ -321,7 +334,7 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)
         instr->mtd = nftl->mbd.mtd;
         instr->addr = block * nftl->EraseSize;
         instr->len = nftl->EraseSize;
-        MTD_ERASE(nftl->mbd.mtd, instr);
+        mtd->erase(mtd, instr);
 
         if (instr->state == MTD_ERASE_FAILED) {
                 printk("Error while formatting block %d\n", block);
@@ -343,8 +356,8 @@ int NFTL_formatblock(struct NFTLrecord *nftl, int block)
                         goto fail;
 
                 uci.WearInfo = le32_to_cpu(nb_erases);
-                if (MTD_WRITEOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8,
-                                 &retlen, (char *)&uci) < 0)
+                if (nftl_write_oob(mtd, block * nftl->EraseSize + SECTORSIZE +
+                                   8, 8, &retlen, (char *)&uci) < 0)
                         goto fail;
                 return 0;
 fail:
@@ -365,6 +378,7 @@ fail:
  *      case. */
 static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_block)
 {
+        struct mtd_info *mtd = nftl->mbd.mtd;
         unsigned int block, i, status;
         struct nftl_bci bci;
         int sectors_per_block;
@@ -374,8 +388,9 @@ static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_b
         block = first_block;
         for (;;) {
                 for (i = 0; i < sectors_per_block; i++) {
-                        if (MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + i * SECTORSIZE,
-                                        8, &retlen, (char *)&bci) < 0)
+                        if (nftl_read_oob(mtd,
+                                          block * nftl->EraseSize + i * SECTORSIZE,
+                                          8, &retlen, (char *)&bci) < 0)
                                 status = SECTOR_IGNORE;
                         else
                                 status = bci.Status | bci.Status1;
@@ -394,9 +409,10 @@ static void check_sectors_in_chain(struct NFTLrecord *nftl, unsigned int first_b
                                         /* sector not free actually : mark it as SECTOR_IGNORE  */
                                         bci.Status = SECTOR_IGNORE;
                                         bci.Status1 = SECTOR_IGNORE;
-                                        MTD_WRITEOOB(nftl->mbd.mtd,
-                                                     block * nftl->EraseSize + i * SECTORSIZE,
-                                                     8, &retlen, (char *)&bci);
+                                        nftl_write_oob(mtd, block *
+                                                       nftl->EraseSize +
+                                                       i * SECTORSIZE, 8,
+                                                       &retlen, (char *)&bci);
                                 }
                                 break;
                         default:
@@ -481,13 +497,14 @@ static void format_chain(struct NFTLrecord *nftl, unsigned int first_block)
  *      1. */
 static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)
 {
+        struct mtd_info *mtd = nftl->mbd.mtd;
         struct nftl_uci1 h1;
         unsigned int erase_mark;
         size_t retlen;
 
         /* check erase mark. */
-        if (MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8,
-                        &retlen, (char *)&h1) < 0)
+        if (nftl_read_oob(mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8,
+                          &retlen, (char *)&h1) < 0)
                 return -1;
 
         erase_mark = le16_to_cpu ((h1.EraseMark | h1.EraseMark1));
@@ -501,8 +518,9 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)
                 h1.EraseMark = cpu_to_le16(ERASE_MARK);
                 h1.EraseMark1 = cpu_to_le16(ERASE_MARK);
                 h1.WearInfo = cpu_to_le32(0);
-                if (MTD_WRITEOOB(nftl->mbd.mtd, block * nftl->EraseSize + SECTORSIZE + 8, 8,
-                                 &retlen, (char *)&h1) < 0)
+                if (nftl_write_oob(mtd,
+                                   block * nftl->EraseSize + SECTORSIZE + 8, 8,
+                                   &retlen, (char *)&h1) < 0)
                         return -1;
         } else {
 #if 0
@@ -513,8 +531,8 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)
                                                 SECTORSIZE, 0) != 0)
                                 return -1;
 
-                        if (MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + i,
-                                        16, &retlen, buf) < 0)
+                        if (nftl_read_oob(mtd, block * nftl->EraseSize + i,
+                                          16, &retlen, buf) < 0)
                                 return -1;
                         if (i == SECTORSIZE) {
                                 /* skip erase mark */
@@ -540,11 +558,12 @@ static int check_and_mark_free_block(struct NFTLrecord *nftl, int block)
  */
 static int get_fold_mark(struct NFTLrecord *nftl, unsigned int block)
 {
+        struct mtd_info *mtd = nftl->mbd.mtd;
         struct nftl_uci2 uci;
         size_t retlen;
 
-        if (MTD_READOOB(nftl->mbd.mtd, block * nftl->EraseSize + 2 * SECTORSIZE + 8,
-                        8, &retlen, (char *)&uci) < 0)
+        if (nftl_read_oob(mtd, block * nftl->EraseSize + 2 * SECTORSIZE + 8,
+                          8, &retlen, (char *)&uci) < 0)
                 return 0;
 
         return le16_to_cpu((uci.FoldMark | uci.FoldMark1));
@@ -558,6 +577,7 @@ int NFTL_mount(struct NFTLrecord *s)
         int chain_length, do_format_chain;
         struct nftl_uci0 h0;
         struct nftl_uci1 h1;
+        struct mtd_info *mtd = s->mbd.mtd;
         size_t retlen;
 
         /* search for NFTL MediaHeader and Spare NFTL Media Header */
@@ -582,10 +602,13 @@ int NFTL_mount(struct NFTLrecord *s)
 
                         for (;;) {
                                 /* read the block header. If error, we format the chain */
-                                if (MTD_READOOB(s->mbd.mtd, block * s->EraseSize + 8, 8,
-                                                &retlen, (char *)&h0) < 0 ||
-                                    MTD_READOOB(s->mbd.mtd, block * s->EraseSize + SECTORSIZE + 8, 8,
-                                                &retlen, (char *)&h1) < 0) {
+                                if (nftl_read_oob(mtd,
+                                                  block * s->EraseSize + 8, 8,
+                                                  &retlen, (char *)&h0) < 0 ||
+                                    nftl_read_oob(mtd,
+                                                  block * s->EraseSize +
+                                                  SECTORSIZE + 8, 8,
+                                                  &retlen, (char *)&h1) < 0) {
                                         s->ReplUnitTable[block] = BLOCK_NIL;
                                         do_format_chain = 1;
                                         break;
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
index 126ff6bf63d5..5930a03736d7 100644
--- a/drivers/mtd/onenand/Kconfig
+++ b/drivers/mtd/onenand/Kconfig
@@ -29,6 +29,20 @@ config MTD_ONENAND_GENERIC
         help
           Support for OneNAND flash via platform device driver.
 
+config MTD_ONENAND_OTP
+        bool "OneNAND OTP Support"
+        depends on MTD_ONENAND
+        help
+          One Block of the NAND Flash Array memory is reserved as
+          a One-Time Programmable Block memory area.
+          Also, 1st Block of NAND Flash Array can be used as OTP.
+
+          The OTP block can be read, programmed and locked using the same
+          operations as any other NAND Flash Array memory block.
+          OTP block cannot be erased.
+
+          OTP block is fully-guaranteed to be a valid block.
+
 config MTD_ONENAND_SYNC_READ
         bool "OneNAND Sync. Burst Read Support"
         depends on ARCH_OMAP
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index a53a73fc2a5a..84ec40d25438 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -23,8 +23,7 @@
 /**
  * onenand_oob_64 - oob info for large (2KB) page
  */
-static struct nand_oobinfo onenand_oob_64 = {
-        .useecc         = MTD_NANDECC_AUTOPLACE,
+static struct nand_ecclayout onenand_oob_64 = {
         .eccbytes       = 20,
         .eccpos         = {
                 8, 9, 10, 11, 12,
@@ -34,14 +33,14 @@ static struct nand_oobinfo onenand_oob_64 = {
                 },
         .oobfree        = {
                 {2, 3}, {14, 2}, {18, 3}, {30, 2},
-                {24, 3}, {46, 2}, {40, 3}, {62, 2} }
+                {34, 3}, {46, 2}, {50, 3}, {62, 2}
+        }
 };
 
 /**
  * onenand_oob_32 - oob info for middle (1KB) page
  */
-static struct nand_oobinfo onenand_oob_32 = {
-        .useecc         = MTD_NANDECC_AUTOPLACE,
+static struct nand_ecclayout onenand_oob_32 = {
         .eccbytes       = 10,
         .eccpos         = {
                 8, 9, 10, 11, 12,
@@ -190,7 +189,7 @@ static int onenand_buffer_address(int dataram1, int sectors, int count)
 static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t len)
 {
         struct onenand_chip *this = mtd->priv;
-        int value, readcmd = 0;
+        int value, readcmd = 0, block_cmd = 0;
         int block, page;
         /* Now we use page size operation */
         int sectors = 4, count = 4;
@@ -206,6 +205,8 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
 
         case ONENAND_CMD_ERASE:
         case ONENAND_CMD_BUFFERRAM:
+        case ONENAND_CMD_OTP_ACCESS:
+                block_cmd = 1;
                 block = (int) (addr >> this->erase_shift);
                 page = -1;
                 break;
@@ -233,6 +234,12 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
                 /* Write 'DFS, FBA' of Flash */
                 value = onenand_block_address(this, block);
                 this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1);
+
+                if (block_cmd) {
+                        /* Select DataRAM for DDP */
+                        value = onenand_bufferram_address(this, block);
+                        this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
+                }
         }
 
         if (page != -1) {
@@ -301,6 +308,7 @@ static int onenand_wait(struct mtd_info *mtd, int state)
 
                 if (state != FL_READING)
                         cond_resched();
+                touch_softlockup_watchdog();
         }
         /* To get correct interrupt status in timeout case */
         interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
@@ -344,7 +352,7 @@ static inline int onenand_bufferram_offset(struct mtd_info *mtd, int area)
 
         if (ONENAND_CURRENT_BUFFERRAM(this)) {
                 if (area == ONENAND_DATARAM)
-                        return mtd->oobblock;
+                        return mtd->writesize;
                 if (area == ONENAND_SPARERAM)
                         return mtd->oobsize;
         }
@@ -372,6 +380,17 @@ static int onenand_read_bufferram(struct mtd_info *mtd, int area,
 
         bufferram += onenand_bufferram_offset(mtd, area);
 
+        if (ONENAND_CHECK_BYTE_ACCESS(count)) {
+                unsigned short word;
+
+                /* Align with word(16-bit) size */
+                count--;
+
+                /* Read word and save byte */
+                word = this->read_word(bufferram + offset + count);
+                buffer[count] = (word & 0xff);
+        }
+
         memcpy(buffer, bufferram + offset, count);
 
         return 0;
@@ -399,6 +418,17 @@ static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area,
 
         this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ);
 
+        if (ONENAND_CHECK_BYTE_ACCESS(count)) {
+                unsigned short word;
+
+                /* Align with word(16-bit) size */
+                count--;
+
+                /* Read word and save byte */
+                word = this->read_word(bufferram + offset + count);
+                buffer[count] = (word & 0xff);
+        }
+
         memcpy(buffer, bufferram + offset, count);
 
         this->mmcontrol(mtd, 0);
@@ -426,6 +456,22 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area,
 
         bufferram += onenand_bufferram_offset(mtd, area);
 
+        if (ONENAND_CHECK_BYTE_ACCESS(count)) {
+                unsigned short word;
+                int byte_offset;
+
+                /* Align with word(16-bit) size */
+                count--;
+
+                /* Calculate byte access offset */
+                byte_offset = offset + count;
+
+                /* Read word and save byte */
+                word = this->read_word(bufferram + byte_offset);
+                word = (word & ~0xff) | buffer[count];
+                this->write_word(word, bufferram + byte_offset);
+        }
+
         memcpy(bufferram + offset, buffer, count);
 
         return 0;
@@ -549,31 +595,28 @@ static void onenand_release_device(struct mtd_info *mtd)
 }
 
 /**
- * onenand_read_ecc - [MTD Interface] Read data with ECC
+ * onenand_read - [MTD Interface] Read data from flash
  * @param mtd           MTD device structure
  * @param from          offset to read from
  * @param len           number of bytes to read
  * @param retlen        pointer to variable to store the number of read bytes
  * @param buf           the databuffer to put data
- * @param oob_buf       filesystem supplied oob data buffer
- * @param oobsel        oob selection structure
  *
- * OneNAND read with ECC
- */
-static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, u_char *buf,
-        u_char *oob_buf, struct nand_oobinfo *oobsel)
+ * Read with ecc
+*/
+static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
+        size_t *retlen, u_char *buf)
 {
         struct onenand_chip *this = mtd->priv;
         int read = 0, column;
         int thislen;
         int ret = 0;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read_ecc: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
 
         /* Do not allow reads past end of device */
         if ((from + len) > mtd->size) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: Attempt read beyond end of device\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: Attempt read beyond end of device\n");
                 *retlen = 0;
                 return -EINVAL;
         }
@@ -584,14 +627,14 @@ static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
         /* TODO handling oob */
 
         while (read < len) {
-                thislen = min_t(int, mtd->oobblock, len - read);
+                thislen = min_t(int, mtd->writesize, len - read);
 
-                column = from & (mtd->oobblock - 1);
-                if (column + thislen > mtd->oobblock)
-                        thislen = mtd->oobblock - column;
+                column = from & (mtd->writesize - 1);
+                if (column + thislen > mtd->writesize)
+                        thislen = mtd->writesize - column;
 
                 if (!onenand_check_bufferram(mtd, from)) {
-                        this->command(mtd, ONENAND_CMD_READ, from, mtd->oobblock);
+                        this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize);
 
                         ret = this->wait(mtd, FL_READING);
                         /* First copy data and check return value for ECC handling */
@@ -606,7 +649,7 @@ static int onenand_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
                         break;
 
                 if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_ecc: read failed = %d\n", ret);
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: read failed = %d\n", ret);
                         goto out;
                 }
 
@@ -628,23 +671,7 @@ out:
 }
 
 /**
- * onenand_read - [MTD Interface] MTD compability function for onenand_read_ecc
- * @param mtd           MTD device structure
- * @param from          offset to read from
- * @param len           number of bytes to read
- * @param retlen        pointer to variable to store the number of read bytes
- * @param buf           the databuffer to put data
- *
- * This function simply calls onenand_read_ecc with oob buffer and oobsel = NULL
-*/
-static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, u_char *buf)
-{
-        return onenand_read_ecc(mtd, from, len, retlen, buf, NULL, NULL);
-}
-
-/**
- * onenand_read_oob - [MTD Interface] OneNAND read out-of-band
+ * onenand_do_read_oob - [MTD Interface] OneNAND read out-of-band
  * @param mtd           MTD device structure
  * @param from          offset to read from
  * @param len           number of bytes to read
@@ -653,8 +680,8 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
  *
  * OneNAND read out-of-band data from the spare area
  */
-static int onenand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
-        size_t *retlen, u_char *buf)
+int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
+                        size_t *retlen, u_char *buf)
 {
         struct onenand_chip *this = mtd->priv;
         int read = 0, thislen, column;
@@ -704,7 +731,7 @@ static int onenand_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
                 /* Read more? */
                 if (read < len) {
                         /* Page size */
-                        from += mtd->oobblock;
+                        from += mtd->writesize;
                         column = 0;
                 }
         }
@@ -717,8 +744,53 @@ out:
         return ret;
 }
 
+/**
+ * onenand_read_oob - [MTD Interface] NAND write data and/or out-of-band
+ * @mtd:        MTD device structure
+ * @from:       offset to read from
+ * @ops:        oob operation description structure
+ */
+static int onenand_read_oob(struct mtd_info *mtd, loff_t from,
+                            struct mtd_oob_ops *ops)
+{
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
+
+        return onenand_do_read_oob(mtd, from + ops->ooboffs, ops->len,
+                                   &ops->retlen, ops->oobbuf);
+}
+
 #ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
 /**
+ * onenand_verify_oob - [GENERIC] verify the oob contents after a write
+ * @param mtd           MTD device structure
+ * @param buf           the databuffer to verify
+ * @param to            offset to read from
+ * @param len           number of bytes to read and compare
+ *
+ */
+static int onenand_verify_oob(struct mtd_info *mtd, const u_char *buf, loff_t to, int len)
+{
+        struct onenand_chip *this = mtd->priv;
+        char *readp = this->page_buf;
+        int column = to & (mtd->oobsize - 1);
+        int status, i;
+
+        this->command(mtd, ONENAND_CMD_READOOB, to, mtd->oobsize);
+        onenand_update_bufferram(mtd, to, 0);
+        status = this->wait(mtd, FL_READING);
+        if (status)
+                return status;
+
+        this->read_bufferram(mtd, ONENAND_SPARERAM, readp, column, len);
+
+        for(i = 0; i < len; i++)
+                if (buf[i] != 0xFF && buf[i] != readp[i])
+                        return -EBADMSG;
+
+        return 0;
+}
+
+/**
  * onenand_verify_page - [GENERIC] verify the chip contents after a write
  * @param mtd           MTD device structure
  * @param buf           the databuffer to verify
@@ -731,7 +803,7 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
         void __iomem *dataram0, *dataram1;
         int ret = 0;
 
-        this->command(mtd, ONENAND_CMD_READ, addr, mtd->oobblock);
+        this->command(mtd, ONENAND_CMD_READ, addr, mtd->writesize);
 
         ret = this->wait(mtd, FL_READING);
         if (ret)
@@ -741,53 +813,51 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
 
         /* Check, if the two dataram areas are same */
         dataram0 = this->base + ONENAND_DATARAM;
-        dataram1 = dataram0 + mtd->oobblock;
+        dataram1 = dataram0 + mtd->writesize;
 
-        if (memcmp(dataram0, dataram1, mtd->oobblock))
+        if (memcmp(dataram0, dataram1, mtd->writesize))
                 return -EBADMSG;
 
         return 0;
 }
 #else
 #define onenand_verify_page(...)        (0)
+#define onenand_verify_oob(...)         (0)
 #endif
 
-#define NOTALIGNED(x)   ((x & (mtd->oobblock - 1)) != 0)
+#define NOTALIGNED(x)   ((x & (mtd->writesize - 1)) != 0)
 
 /**
- * onenand_write_ecc - [MTD Interface] OneNAND write with ECC
+ * onenand_write - [MTD Interface] write buffer to FLASH
  * @param mtd           MTD device structure
  * @param to            offset to write to
  * @param len           number of bytes to write
  * @param retlen        pointer to variable to store the number of written bytes
  * @param buf           the data to write
- * @param eccbuf        filesystem supplied oob data buffer
- * @param oobsel        oob selection structure
  *
- * OneNAND write with ECC
+ * Write with ECC
  */
-static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
-        size_t *retlen, const u_char *buf,
-        u_char *eccbuf, struct nand_oobinfo *oobsel)
+static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
+        size_t *retlen, const u_char *buf)
 {
         struct onenand_chip *this = mtd->priv;
         int written = 0;
         int ret = 0;
 
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_ecc: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
+        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
 
         /* Initialize retlen, in case of early exit */
         *retlen = 0;
 
         /* Do not allow writes past end of device */
         if (unlikely((to + len) > mtd->size)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt write to past end of device\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: Attempt write to past end of device\n");
                 return -EINVAL;
         }
 
         /* Reject writes, which are not page aligned */
         if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(len))) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: Attempt to write not page aligned data\n");
+                DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: Attempt to write not page aligned data\n");
                 return -EINVAL;
         }
 
@@ -796,20 +866,20 @@ static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
 
         /* Loop until all data write */
         while (written < len) {
-                int thislen = min_t(int, mtd->oobblock, len - written);
+                int thislen = min_t(int, mtd->writesize, len - written);
 
-                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobblock);
+                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->writesize);
 
                 this->write_bufferram(mtd, ONENAND_DATARAM, buf, 0, thislen);
                 this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
 
-                this->command(mtd, ONENAND_CMD_PROG, to, mtd->oobblock);
+                this->command(mtd, ONENAND_CMD_PROG, to, mtd->writesize);
 
                 onenand_update_bufferram(mtd, to, 1);
 
                 ret = this->wait(mtd, FL_WRITING);
                 if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: write filaed %d\n", ret);
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: write filaed %d\n", ret);
                         goto out;
                 }
 
@@ -818,7 +888,7 @@ static int onenand_write_ecc(struct mtd_info *mtd, loff_t to, size_t len,
                 /* Only check verify write turn on */
                 ret = onenand_verify_page(mtd, (u_char *) buf, to);
                 if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_ecc: verify failed %d\n", ret);
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: verify failed %d\n", ret);
                         goto out;
                 }
 
@@ -839,24 +909,7 @@ out:
 }
 
 /**
- * onenand_write - [MTD Interface] compability function for onenand_write_ecc
- * @param mtd           MTD device structure
- * @param to            offset to write to
- * @param len           number of bytes to write
- * @param retlen        pointer to variable to store the number of written bytes
- * @param buf           the data to write
- *
- * This function simply calls onenand_write_ecc
- * with oob buffer and oobsel = NULL
- */
-static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
-        size_t *retlen, const u_char *buf)
-{
-        return onenand_write_ecc(mtd, to, len, retlen, buf, NULL, NULL);
-}
-
-/**
- * onenand_write_oob - [MTD Interface] OneNAND write out-of-band
+ * onenand_do_write_oob - [Internal] OneNAND write out-of-band
  * @param mtd           MTD device structure
  * @param to            offset to write to
  * @param len           number of bytes to write
@@ -865,11 +918,11 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
  *
  * OneNAND write out-of-band
  */
-static int onenand_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
-        size_t *retlen, const u_char *buf)
+static int onenand_do_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
+                                size_t *retlen, const u_char *buf)
 {
         struct onenand_chip *this = mtd->priv;
-        int column, status;
+        int column, ret = 0;
         int written = 0;
 
         DEBUG(MTD_DEBUG_LEVEL3, "onenand_write_oob: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
@@ -894,16 +947,27 @@ static int onenand_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
 
                 this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobsize);
 
-                this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
-                this->write_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);
+                /* We send data to spare ram with oobsize
+                 * to prevent byte access */
+                memset(this->page_buf, 0xff, mtd->oobsize);
+                memcpy(this->page_buf + column, buf, thislen);
+                this->write_bufferram(mtd, ONENAND_SPARERAM, this->page_buf, 0, mtd->oobsize);
 
                 this->command(mtd, ONENAND_CMD_PROGOOB, to, mtd->oobsize);
 
                 onenand_update_bufferram(mtd, to, 0);
 
-                status = this->wait(mtd, FL_WRITING);
-                if (status)
+                ret = this->wait(mtd, FL_WRITING);
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_oob: write filaed %d\n", ret);
+                        goto out;
+                }
+
+                ret = onenand_verify_oob(mtd, buf, to, thislen);
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write_oob: verify failed %d\n", ret);
                         goto out;
+                }
 
                 written += thislen;
 
@@ -920,145 +984,22 @@ out:
 
         *retlen = written;
 
-        return 0;
+        return ret;
 }
 
 /**
- * onenand_writev_ecc - [MTD Interface] write with iovec with ecc
- * @param mtd           MTD device structure
- * @param vecs          the iovectors to write
- * @param count         number of vectors
- * @param to            offset to write to
- * @param retlen        pointer to variable to store the number of written bytes
- * @param eccbuf        filesystem supplied oob data buffer
- * @param oobsel        oob selection structure
- *
- * OneNAND write with iovec with ecc
+ * onenand_write_oob - [MTD Interface] NAND write data and/or out-of-band
+ * @mtd:        MTD device structure
+ * @from:       offset to read from
+ * @ops:        oob operation description structure
  */
-static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
-        unsigned long count, loff_t to, size_t *retlen,
-        u_char *eccbuf, struct nand_oobinfo *oobsel)
+static int onenand_write_oob(struct mtd_info *mtd, loff_t to,
+                             struct mtd_oob_ops *ops)
 {
-        struct onenand_chip *this = mtd->priv;
-        unsigned char *pbuf;
-        size_t total_len, len;
-        int i, written = 0;
-        int ret = 0;
-
-        /* Preset written len for early exit */
-        *retlen = 0;
-
-        /* Calculate total length of data */
-        total_len = 0;
-        for (i = 0; i < count; i++)
-                total_len += vecs[i].iov_len;
-
-        DEBUG(MTD_DEBUG_LEVEL3, "onenand_writev_ecc: to = 0x%08x, len = %i, count = %ld\n", (unsigned int) to, (unsigned int) total_len, count);
-
-        /* Do not allow write past end of the device */
-        if (unlikely((to + total_len) > mtd->size)) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: Attempted write past end of device\n");
-                return -EINVAL;
-        }
-
-        /* Reject writes, which are not page aligned */
-        if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(total_len))) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: Attempt to write not page aligned data\n");
-                return -EINVAL;
-        }
-
-        /* Grab the lock and see if the device is available */
-        onenand_get_device(mtd, FL_WRITING);
-
-        /* TODO handling oob */
-
-        /* Loop until all keve's data has been written */
-        len = 0;
-        while (count) {
-                pbuf = this->page_buf;
-                /*
-                 * If the given tuple is >= pagesize then
-                 * write it out from the iov
-                 */
-                if ((vecs->iov_len - len) >= mtd->oobblock) {
-                        pbuf = vecs->iov_base + len;
-
-                        len += mtd->oobblock;
-
-                        /* Check, if we have to switch to the next tuple */
-                        if (len >= (int) vecs->iov_len) {
-                                vecs++;
-                                len = 0;
-                                count--;
-                        }
-                } else {
-                        int cnt = 0, thislen;
-                        while (cnt < mtd->oobblock) {
-                                thislen = min_t(int, mtd->oobblock - cnt, vecs->iov_len - len);
-                                memcpy(this->page_buf + cnt, vecs->iov_base + len, thislen);
-                                cnt += thislen;
-                                len += thislen;
-
-                                /* Check, if we have to switch to the next tuple */
-                                if (len >= (int) vecs->iov_len) {
-                                        vecs++;
-                                        len = 0;
-                                        count--;
-                                }
-                        }
-                }
-
-                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobblock);
+        BUG_ON(ops->mode != MTD_OOB_PLACE);
 
-                this->write_bufferram(mtd, ONENAND_DATARAM, pbuf, 0, mtd->oobblock);
-                this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
-
-                this->command(mtd, ONENAND_CMD_PROG, to, mtd->oobblock);
-
-                onenand_update_bufferram(mtd, to, 1);
-
-                ret = this->wait(mtd, FL_WRITING);
-                if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: write failed %d\n", ret);
-                        goto out;
-                }
-
-
-                /* Only check verify write turn on */
-                ret = onenand_verify_page(mtd, (u_char *) pbuf, to);
-                if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_writev_ecc: verify failed %d\n", ret);
-                        goto out;
-                }
-
-                written += mtd->oobblock;
-
-                to += mtd->oobblock;
-        }
-
-out:
-        /* Deselect and wakt up anyone waiting on the device */
-        onenand_release_device(mtd);
-
-        *retlen = written;
-
-        return 0;
-}
-
-/**
- * onenand_writev - [MTD Interface] compabilty function for onenand_writev_ecc
- * @param mtd           MTD device structure
- * @param vecs          the iovectors to write
- * @param count         number of vectors
- * @param to            offset to write to
- * @param retlen        pointer to variable to store the number of written bytes
- *
- * OneNAND write with kvec. This just calls the ecc function
- */
-static int onenand_writev(struct mtd_info *mtd, const struct kvec *vecs,
-        unsigned long count, loff_t to, size_t *retlen)
-{
-        return onenand_writev_ecc(mtd, vecs, count, to, retlen, NULL, NULL);
+        return onenand_do_write_oob(mtd, to + ops->ooboffs, ops->len,
+                                    &ops->retlen, ops->oobbuf);
 }
 
 /**
@@ -1227,7 +1168,7 @@ static int onenand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
 
         /* We write two bytes, so we dont have to mess with 16 bit access */
         ofs += mtd->oobsize + (bbm->badblockpos & ~0x01);
-        return mtd->write_oob(mtd, ofs , 2, &retlen, buf);
+        return onenand_do_write_oob(mtd, ofs , 2, &retlen, buf);
 }
 
 /**
@@ -1324,6 +1265,304 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
         return 0;
 }
 
+#ifdef CONFIG_MTD_ONENAND_OTP
+
+/* Interal OTP operation */
+typedef int (*otp_op_t)(struct mtd_info *mtd, loff_t form, size_t len,
+                size_t *retlen, u_char *buf);
+
+/**
+ * do_otp_read - [DEFAULT] Read OTP block area
+ * @param mtd           MTD device structure
+ * @param from          The offset to read
+ * @param len           number of bytes to read
+ * @param retlen        pointer to variable to store the number of readbytes
+ * @param buf           the databuffer to put/get data
+ *
+ * Read OTP block area.
+ */
+static int do_otp_read(struct mtd_info *mtd, loff_t from, size_t len,
+                size_t *retlen, u_char *buf)
+{
+        struct onenand_chip *this = mtd->priv;
+        int ret;
+
+        /* Enter OTP access mode */
+        this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
+        this->wait(mtd, FL_OTPING);
+
+        ret = mtd->read(mtd, from, len, retlen, buf);
+
+        /* Exit OTP access mode */
+        this->command(mtd, ONENAND_CMD_RESET, 0, 0);
+        this->wait(mtd, FL_RESETING);
+
+        return ret;
+}
+
+/**
+ * do_otp_write - [DEFAULT] Write OTP block area
+ * @param mtd           MTD device structure
+ * @param from          The offset to write
+ * @param len           number of bytes to write
+ * @param retlen        pointer to variable to store the number of write bytes
+ * @param buf           the databuffer to put/get data
+ *
+ * Write OTP block area.
+ */
+static int do_otp_write(struct mtd_info *mtd, loff_t from, size_t len,
+                size_t *retlen, u_char *buf)
+{
+        struct onenand_chip *this = mtd->priv;
+        unsigned char *pbuf = buf;
+        int ret;
+
+        /* Force buffer page aligned */
+        if (len < mtd->writesize) {
+                memcpy(this->page_buf, buf, len);
+                memset(this->page_buf + len, 0xff, mtd->writesize - len);
+                pbuf = this->page_buf;
+                len = mtd->writesize;
+        }
+
+        /* Enter OTP access mode */
+        this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
+        this->wait(mtd, FL_OTPING);
+
+        ret = mtd->write(mtd, from, len, retlen, pbuf);
+
+        /* Exit OTP access mode */
+        this->command(mtd, ONENAND_CMD_RESET, 0, 0);
+        this->wait(mtd, FL_RESETING);
+
+        return ret;
+}
+
+/**
+ * do_otp_lock - [DEFAULT] Lock OTP block area
+ * @param mtd           MTD device structure
+ * @param from          The offset to lock
+ * @param len           number of bytes to lock
+ * @param retlen        pointer to variable to store the number of lock bytes
+ * @param buf           the databuffer to put/get data
+ *
+ * Lock OTP block area.
+ */
+static int do_otp_lock(struct mtd_info *mtd, loff_t from, size_t len,
+                size_t *retlen, u_char *buf)
+{
+        struct onenand_chip *this = mtd->priv;
+        int ret;
+
+        /* Enter OTP access mode */
+        this->command(mtd, ONENAND_CMD_OTP_ACCESS, 0, 0);
+        this->wait(mtd, FL_OTPING);
+
+        ret = onenand_do_write_oob(mtd, from, len, retlen, buf);
+
+        /* Exit OTP access mode */
+        this->command(mtd, ONENAND_CMD_RESET, 0, 0);
+        this->wait(mtd, FL_RESETING);
+
+        return ret;
+}
+
+/**
+ * onenand_otp_walk - [DEFAULT] Handle OTP operation
+ * @param mtd           MTD device structure
+ * @param from          The offset to read/write
+ * @param len           number of bytes to read/write
+ * @param retlen        pointer to variable to store the number of read bytes
+ * @param buf           the databuffer to put/get data
+ * @param action        do given action
+ * @param mode          specify user and factory
+ *
+ * Handle OTP operation.
+ */
+static int onenand_otp_walk(struct mtd_info *mtd, loff_t from, size_t len,
+                        size_t *retlen, u_char *buf,
+                        otp_op_t action, int mode)
+{
+        struct onenand_chip *this = mtd->priv;
+        int otp_pages;
+        int density;
+        int ret = 0;
+
+        *retlen = 0;
+
+        density = this->device_id >> ONENAND_DEVICE_DENSITY_SHIFT;
+        if (density < ONENAND_DEVICE_DENSITY_512Mb)
+                otp_pages = 20;
+        else
+                otp_pages = 10;
+
+        if (mode == MTD_OTP_FACTORY) {
+                from += mtd->writesize * otp_pages;
+                otp_pages = 64 - otp_pages;
+        }
+
+        /* Check User/Factory boundary */
+        if (((mtd->writesize * otp_pages) - (from + len)) < 0)
+                return 0;
+
+        while (len > 0 && otp_pages > 0) {
+                if (!action) {  /* OTP Info functions */
+                        struct otp_info *otpinfo;
+
+                        len -= sizeof(struct otp_info);
+                        if (len <= 0)
+                                return -ENOSPC;
+
+                        otpinfo = (struct otp_info *) buf;
+                        otpinfo->start = from;
+                        otpinfo->length = mtd->writesize;
+                        otpinfo->locked = 0;
+
+                        from += mtd->writesize;
+                        buf += sizeof(struct otp_info);
+                        *retlen += sizeof(struct otp_info);
+                } else {
+                        size_t tmp_retlen;
+                        int size = len;
+
+                        ret = action(mtd, from, len, &tmp_retlen, buf);
+
+                        buf += size;
+                        len -= size;
+                        *retlen += size;
+
+                        if (ret < 0)
+                                return ret;
+                }
+                otp_pages--;
+        }
+
+        return 0;
+}
+
+/**
+ * onenand_get_fact_prot_info - [MTD Interface] Read factory OTP info
+ * @param mtd           MTD device structure
+ * @param buf           the databuffer to put/get data
+ * @param len           number of bytes to read
+ *
+ * Read factory OTP info.
+ */
+static int onenand_get_fact_prot_info(struct mtd_info *mtd,
+                        struct otp_info *buf, size_t len)
+{
+        size_t retlen;
+        int ret;
+
+        ret = onenand_otp_walk(mtd, 0, len, &retlen, (u_char *) buf, NULL, MTD_OTP_FACTORY);
+
+        return ret ? : retlen;
+}
+
+/**
+ * onenand_read_fact_prot_reg - [MTD Interface] Read factory OTP area
+ * @param mtd           MTD device structure
+ * @param from          The offset to read
+ * @param len           number of bytes to read
+ * @param retlen        pointer to variable to store the number of read bytes
+ * @param buf           the databuffer to put/get data
+ *
+ * Read factory OTP area.
+ */
+static int onenand_read_fact_prot_reg(struct mtd_info *mtd, loff_t from,
+                        size_t len, size_t *retlen, u_char *buf)
+{
+        return onenand_otp_walk(mtd, from, len, retlen, buf, do_otp_read, MTD_OTP_FACTORY);
+}
+
+/**
+ * onenand_get_user_prot_info - [MTD Interface] Read user OTP info
+ * @param mtd           MTD device structure
+ * @param buf           the databuffer to put/get data
+ * @param len           number of bytes to read
+ *
+ * Read user OTP info.
+ */
+static int onenand_get_user_prot_info(struct mtd_info *mtd,
+                        struct otp_info *buf, size_t len)
+{
+        size_t retlen;
+        int ret;
+
+        ret = onenand_otp_walk(mtd, 0, len, &retlen, (u_char *) buf, NULL, MTD_OTP_USER);
+
+        return ret ? : retlen;
+}
+
+/**
+ * onenand_read_user_prot_reg - [MTD Interface] Read user OTP area
+ * @param mtd           MTD device structure
+ * @param from          The offset to read
+ * @param len           number of bytes to read
+ * @param retlen        pointer to variable to store the number of read bytes
+ * @param buf           the databuffer to put/get data
+ *
+ * Read user OTP area.
+ */
+static int onenand_read_user_prot_reg(struct mtd_info *mtd, loff_t from,
+                        size_t len, size_t *retlen, u_char *buf)
+{
+        return onenand_otp_walk(mtd, from, len, retlen, buf, do_otp_read, MTD_OTP_USER);
+}
+
+/**
+ * onenand_write_user_prot_reg - [MTD Interface] Write user OTP area
+ * @param mtd           MTD device structure
+ * @param from          The offset to write
+ * @param len           number of bytes to write
+ * @param retlen        pointer to variable to store the number of write bytes
+ * @param buf           the databuffer to put/get data
+ *
+ * Write user OTP area.
+ */
+static int onenand_write_user_prot_reg(struct mtd_info *mtd, loff_t from,
+                        size_t len, size_t *retlen, u_char *buf)
+{
+        return onenand_otp_walk(mtd, from, len, retlen, buf, do_otp_write, MTD_OTP_USER);
+}
+
+/**
+ * onenand_lock_user_prot_reg - [MTD Interface] Lock user OTP area
+ * @param mtd           MTD device structure
+ * @param from          The offset to lock
+ * @param len           number of bytes to unlock
+ *
+ * Write lock mark on spare area in page 0 in OTP block
+ */
+static int onenand_lock_user_prot_reg(struct mtd_info *mtd, loff_t from,
+                        size_t len)
+{
+        unsigned char oob_buf[64];
+        size_t retlen;
+        int ret;
+
+        memset(oob_buf, 0xff, mtd->oobsize);
+        /*
+         * Note: OTP lock operation
+         *       OTP block : 0xXXFC
+         *       1st block : 0xXXF3 (If chip support)
+         *       Both      : 0xXXF0 (If chip support)
+         */
+        oob_buf[ONENAND_OTP_LOCK_OFFSET] = 0xFC;
+
+        /*
+         * Write lock mark to 8th word of sector0 of page0 of the spare0.
+         * We write 16 bytes spare area instead of 2 bytes.
+         */
+        from = 0;
+        len = 16;
+
+        ret = onenand_otp_walk(mtd, from, len, &retlen, oob_buf, do_otp_lock, MTD_OTP_USER);
+
+        return ret ? : retlen;
+}
+#endif  /* CONFIG_MTD_ONENAND_OTP */
+
 /**
  * onenand_print_device_info - Print device ID
  * @param device        device ID
@@ -1423,15 +1662,15 @@ static int onenand_probe(struct mtd_info *mtd)
 
         /* OneNAND page size & block size */
         /* The data buffer size is equal to page size */
-        mtd->oobblock = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE);
-        mtd->oobsize = mtd->oobblock >> 5;
+        mtd->writesize = this->read_word(this->base + ONENAND_REG_DATA_BUFFER_SIZE);
+        mtd->oobsize = mtd->writesize >> 5;
         /* Pagers per block is always 64 in OneNAND */
-        mtd->erasesize = mtd->oobblock << 6;
+        mtd->erasesize = mtd->writesize << 6;
 
         this->erase_shift = ffs(mtd->erasesize) - 1;
-        this->page_shift = ffs(mtd->oobblock) - 1;
+        this->page_shift = ffs(mtd->writesize) - 1;
         this->ppb_shift = (this->erase_shift - this->page_shift);
-        this->page_mask = (mtd->erasesize / mtd->oobblock) - 1;
+        this->page_mask = (mtd->erasesize / mtd->writesize) - 1;
 
         /* REVIST: Multichip handling */
 
@@ -1475,7 +1714,6 @@ static void onenand_resume(struct mtd_info *mtd)
                                 "in suspended state\n");
 }
 
-
 /**
  * onenand_scan - [OneNAND Interface] Scan for the OneNAND device
  * @param mtd           MTD device structure
@@ -1522,7 +1760,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
         /* Allocate buffers, if necessary */
         if (!this->page_buf) {
                 size_t len;
-                len = mtd->oobblock + mtd->oobsize;
+                len = mtd->writesize + mtd->oobsize;
                 this->page_buf = kmalloc(len, GFP_KERNEL);
                 if (!this->page_buf) {
                         printk(KERN_ERR "onenand_scan(): Can't allocate page_buf\n");
@@ -1537,40 +1775,42 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
 
         switch (mtd->oobsize) {
         case 64:
-                this->autooob = &onenand_oob_64;
+                this->ecclayout = &onenand_oob_64;
                 break;
 
         case 32:
-                this->autooob = &onenand_oob_32;
+                this->ecclayout = &onenand_oob_32;
                 break;
 
         default:
                 printk(KERN_WARNING "No OOB scheme defined for oobsize %d\n",
                         mtd->oobsize);
                 /* To prevent kernel oops */
-                this->autooob = &onenand_oob_32;
+                this->ecclayout = &onenand_oob_32;
                 break;
         }
 
-        memcpy(&mtd->oobinfo, this->autooob, sizeof(mtd->oobinfo));
+        mtd->ecclayout = this->ecclayout;
 
         /* Fill in remaining MTD driver data */
         mtd->type = MTD_NANDFLASH;
-        mtd->flags = MTD_CAP_NANDFLASH | MTD_ECC;
+        mtd->flags = MTD_CAP_NANDFLASH;
         mtd->ecctype = MTD_ECC_SW;
         mtd->erase = onenand_erase;
         mtd->point = NULL;
         mtd->unpoint = NULL;
         mtd->read = onenand_read;
         mtd->write = onenand_write;
-        mtd->read_ecc = onenand_read_ecc;
-        mtd->write_ecc = onenand_write_ecc;
         mtd->read_oob = onenand_read_oob;
         mtd->write_oob = onenand_write_oob;
-        mtd->readv = NULL;
-        mtd->readv_ecc = NULL;
-        mtd->writev = onenand_writev;
-        mtd->writev_ecc = onenand_writev_ecc;
+#ifdef CONFIG_MTD_ONENAND_OTP
+        mtd->get_fact_prot_info = onenand_get_fact_prot_info;
+        mtd->read_fact_prot_reg = onenand_read_fact_prot_reg;
+        mtd->get_user_prot_info = onenand_get_user_prot_info;
+        mtd->read_user_prot_reg = onenand_read_user_prot_reg;
+        mtd->write_user_prot_reg = onenand_write_user_prot_reg;
+        mtd->lock_user_prot_reg = onenand_lock_user_prot_reg;
+#endif
         mtd->sync = onenand_sync;
         mtd->lock = NULL;
         mtd->unlock = onenand_unlock;
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 4510d3361eaa..1b00dac3d7d6 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -17,6 +17,9 @@
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/compatmac.h>
 
+extern int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
+                               size_t *retlen, u_char *buf);
+
 /**
  * check_short_pattern - [GENERIC] check if a pattern is in the buffer
  * @param buf           the buffer to search
@@ -87,13 +90,13 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
 
                         /* No need to read pages fully,
                          * just read required OOB bytes */
-                        ret = mtd->read_oob(mtd, from + j * mtd->oobblock + bd->offs,
-                                                readlen, &retlen, &buf[0]);
+                        ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs,
+                                                  readlen, &retlen, &buf[0]);
 
                         if (ret)
                                 return ret;
 
-                        if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->oobblock, bd)) {
+                        if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {
                                 bbm->bbt[i >> 3] |= 0x03 << (i & 0x6);
                                 printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
                                         i >> 1, (unsigned int) from);
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index c077d2ec9cdd..5b58523e4d4e 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -1,5 +1,5 @@
 /*
- * $Id: redboot.c,v 1.19 2005/12/01 10:03:51 dwmw2 Exp $
+ * $Id: redboot.c,v 1.21 2006/03/30 18:34:37 bjd Exp $
  *
  * Parse RedBoot-style Flash Image System (FIS) tables and
  * produce a Linux partition array to match.
@@ -15,14 +15,14 @@
 
 struct fis_image_desc {
     unsigned char name[16];      // Null terminated name
-    unsigned long flash_base;    // Address within FLASH of image
-    unsigned long mem_base;      // Address in memory where it executes
-    unsigned long size;          // Length of image
-    unsigned long entry_point;   // Execution entry point
-    unsigned long data_length;   // Length of actual data
-    unsigned char _pad[256-(16+7*sizeof(unsigned long))];
-    unsigned long desc_cksum;    // Checksum over image descriptor
-    unsigned long file_cksum;    // Checksum over image data
+    uint32_t      flash_base;    // Address within FLASH of image
+    uint32_t      mem_base;      // Address in memory where it executes
+    uint32_t      size;          // Length of image
+    uint32_t      entry_point;   // Execution entry point
+    uint32_t      data_length;   // Length of actual data
+    unsigned char _pad[256-(16+7*sizeof(uint32_t))];
+    uint32_t      desc_cksum;    // Checksum over image descriptor
+    uint32_t      file_cksum;    // Checksum over image data
 };
 
 struct fis_list {
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index a3e00a4635a5..fa4362fb4dd8 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2005  Sean Young <sean@mess.org>
  *
- * $Id: rfd_ftl.c,v 1.5 2005/11/07 11:14:21 gleixner Exp $
+ * $Id: rfd_ftl.c,v 1.8 2006/01/15 12:51:44 sean Exp $
  *
  * This type of flash translation layer (FTL) is used by the Embedded BIOS
  * by General Software. It is known as the Resident Flash Disk (RFD), see:
@@ -61,6 +61,7 @@ struct block {
                 BLOCK_OK,
                 BLOCK_ERASING,
                 BLOCK_ERASED,
+                BLOCK_UNUSED,
                 BLOCK_FAILED
         } state;
         int free_sectors;
@@ -99,10 +100,8 @@ static int build_block_map(struct partition *part, int block_no)
         block->offset = part->block_size * block_no;
 
         if (le16_to_cpu(part->header_cache[0]) != RFD_MAGIC) {
-                block->state = BLOCK_ERASED; /* assumption */
-                block->free_sectors = part->data_sectors_per_block;
-                part->reserved_block = block_no;
-                return 1;
+                block->state = BLOCK_UNUSED;
+                return -ENOENT;
         }
 
         block->state = BLOCK_OK;
@@ -124,7 +123,7 @@ static int build_block_map(struct partition *part, int block_no)
                         entry = 0;
 
                 if (entry >= part->sector_count) {
-                        printk(KERN_NOTICE PREFIX
+                        printk(KERN_WARNING PREFIX
                                 "'%s': unit #%d: entry %d corrupt, "
                                 "sector %d out of range\n",
                                 part->mbd.mtd->name, block_no, i, entry);
@@ -132,7 +131,7 @@ static int build_block_map(struct partition *part, int block_no)
                 }
 
                 if (part->sector_map[entry] != -1) {
-                        printk(KERN_NOTICE PREFIX
+                        printk(KERN_WARNING PREFIX
                                 "'%s': more than one entry for sector %d\n",
                                 part->mbd.mtd->name, entry);
                         part->errors = 1;
@@ -167,7 +166,7 @@ static int scan_header(struct partition *part)
         /* each erase block has three bytes header, followed by the map */
         part->header_sectors_per_block =
                         ((HEADER_MAP_OFFSET + sectors_per_block) *
-                        sizeof(u16) + SECTOR_SIZE - 1) / SECTOR_SIZE;
+                        sizeof(u16) + SECTOR_SIZE - 1) / SECTOR_SIZE;
 
         part->data_sectors_per_block = sectors_per_block -
                         part->header_sectors_per_block;
@@ -226,7 +225,7 @@ static int scan_header(struct partition *part)
         }
 
         if (part->reserved_block == -1) {
-                printk(KERN_NOTICE PREFIX "'%s': no empty erase unit found\n",
+                printk(KERN_WARNING PREFIX "'%s': no empty erase unit found\n",
                                 part->mbd.mtd->name);
 
                 part->errors = 1;
@@ -315,7 +314,7 @@ static void erase_callback(struct erase_info *erase)
                 rc = -EIO;
 
         if (rc) {
-                printk(KERN_NOTICE PREFIX "'%s': unable to write RFD "
+                printk(KERN_ERR PREFIX "'%s': unable to write RFD "
                                 "header at 0x%lx\n",
                                 part->mbd.mtd->name,
                                 part->blocks[i].offset);
@@ -348,7 +347,7 @@ static int erase_block(struct partition *part, int block)
         rc = part->mbd.mtd->erase(part->mbd.mtd, erase);
 
         if (rc) {
-                printk(KERN_WARNING PREFIX "erase of region %x,%x on '%s' "
+                printk(KERN_ERR PREFIX "erase of region %x,%x on '%s' "
                                 "failed\n", erase->addr, erase->len,
                                 part->mbd.mtd->name);
                 kfree(erase);
@@ -383,7 +382,7 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old
                 rc = -EIO;
 
         if (rc) {
-                printk(KERN_NOTICE PREFIX "error reading '%s' at "
+                printk(KERN_ERR PREFIX "error reading '%s' at "
                         "0x%lx\n", part->mbd.mtd->name,
                         part->blocks[block_no].offset);
 
@@ -423,7 +422,7 @@ static int move_block_contents(struct partition *part, int block_no, u_long *old
                         rc = -EIO;
 
                 if (rc) {
-                        printk(KERN_NOTICE PREFIX "'%s': Unable to "
+                        printk(KERN_ERR PREFIX "'%s': Unable to "
                                 "read sector for relocation\n",
                                 part->mbd.mtd->name);
 
@@ -520,7 +519,7 @@ static int reclaim_block(struct partition *part, u_long *old_sector)
  * because if we fill that one up first it'll have the most chance of having
  * the least live sectors at reclaim.
  */
-static int find_free_block(const struct partition *part)
+static int find_free_block(struct partition *part)
 {
         int block, stop;
 
@@ -533,6 +532,9 @@ static int find_free_block(const struct partition *part)
                                 block != part->reserved_block)
                         return block;
 
+                if (part->blocks[block].state == BLOCK_UNUSED)
+                        erase_block(part, block);
+
                 if (++block >= part->total_blocks)
                         block = 0;
 
@@ -541,7 +543,7 @@ static int find_free_block(const struct partition *part)
         return -1;
 }
 
-static int find_writeable_block(struct partition *part, u_long *old_sector)
+static int find_writable_block(struct partition *part, u_long *old_sector)
 {
         int rc, block;
         size_t retlen;
@@ -570,7 +572,7 @@ static int find_writeable_block(struct partition *part, u_long *old_sector)
                 rc = -EIO;
 
         if (rc) {
-                printk(KERN_NOTICE PREFIX "'%s': unable to read header at "
+                printk(KERN_ERR PREFIX "'%s': unable to read header at "
                                 "0x%lx\n", part->mbd.mtd->name,
                                 part->blocks[block].offset);
                 goto err;
@@ -602,7 +604,7 @@ static int mark_sector_deleted(struct partition *part, u_long old_addr)
                 rc = -EIO;
 
         if (rc) {
-                printk(KERN_WARNING PREFIX "error writing '%s' at "
+                printk(KERN_ERR PREFIX "error writing '%s' at "
                         "0x%lx\n", part->mbd.mtd->name, addr);
                 if (rc)
                         goto err;
@@ -652,7 +654,7 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,
         if (part->current_block == -1 ||
                 !part->blocks[part->current_block].free_sectors) {
 
-                rc = find_writeable_block(part, old_addr);
+                rc = find_writable_block(part, old_addr);
                 if (rc)
                         goto err;
         }
@@ -675,7 +677,7 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,
                 rc = -EIO;
 
         if (rc) {
-                printk(KERN_WARNING PREFIX "error writing '%s' at 0x%lx\n",
+                printk(KERN_ERR PREFIX "error writing '%s' at 0x%lx\n",
                                 part->mbd.mtd->name, addr);
                 if (rc)
                         goto err;
@@ -695,7 +697,7 @@ static int do_writesect(struct mtd_blktrans_dev *dev, u_long sector, char *buf,
                 rc = -EIO;
 
         if (rc) {
-                printk(KERN_WARNING PREFIX "error writing '%s' at 0x%lx\n",
+                printk(KERN_ERR PREFIX "error writing '%s' at 0x%lx\n",
                                 part->mbd.mtd->name, addr);
                 if (rc)
                         goto err;
@@ -776,7 +778,7 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
                 part->block_size = block_size;
         else {
                 if (!mtd->erasesize) {
-                        printk(KERN_NOTICE PREFIX "please provide block_size");
+                        printk(KERN_WARNING PREFIX "please provide block_size");
                         return;
                 }
                 else
@@ -791,8 +793,8 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
                 if (!(mtd->flags & MTD_WRITEABLE))
                         part->mbd.readonly = 1;
                 else if (part->errors) {
-                        printk(KERN_NOTICE PREFIX "'%s': errors found, "
-                                        "setting read-only", mtd->name);
+                        printk(KERN_WARNING PREFIX "'%s': errors found, "
+                                        "setting read-only\n", mtd->name);
                         part->mbd.readonly = 1;
                 }