8 files changed, 30 insertions, 17 deletions

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index f1d60b6f048e..df25cabb0481 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -134,10 +134,10 @@ config MTD_NAND_S3C2410_HWECC
 
 config MTD_NAND_NDFC
         tristate "NDFC NanD Flash Controller"
-        depends on 44x
+        depends on 4xx
         select MTD_NAND_ECC_SMC
         help
-         NDFC Nand Flash Controllers are integrated in EP44x SoCs
+         NDFC Nand Flash Controllers are integrated in IBM/AMCC's 4xx SoCs
 
 config MTD_NAND_S3C2410_CLKSTOP
         bool "S3C2410 NAND IDLE clock stop"
@@ -237,7 +237,7 @@ config MTD_NAND_CAFE
         select REED_SOLOMON
         select REED_SOLOMON_DEC16
         help
-          Use NAND flash attached to the CAFÉ chip designed for the $100
+          Use NAND flash attached to the CAFÉ chip designed for the OLPC
           laptop.
 
 config MTD_NAND_CS553X
diff --git a/drivers/mtd/nand/at91_nand.c b/drivers/mtd/nand/at91_nand.c
index 512e999177f7..b2a5672df6e0 100644
--- a/drivers/mtd/nand/at91_nand.c
+++ b/drivers/mtd/nand/at91_nand.c
@@ -128,7 +128,10 @@ static int __init at91_nand_probe(struct platform_device *pdev)
         nand_chip->IO_ADDR_R = host->io_base;
         nand_chip->IO_ADDR_W = host->io_base;
         nand_chip->cmd_ctrl = at91_nand_cmd_ctrl;
-        nand_chip->dev_ready = at91_nand_device_ready;
+
+        if (host->board->rdy_pin)
+                nand_chip->dev_ready = at91_nand_device_ready;
+
         nand_chip->ecc.mode = NAND_ECC_SOFT;    /* enable ECC */
         nand_chip->chip_delay = 20;             /* 20us command delay time */
 
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e96259f22cca..ab9f5c5db38d 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -56,8 +56,6 @@ static unsigned long __initdata doc_locations[] = {
 #endif /*  CONFIG_MTD_DOCPROBE_HIGH */
 #elif defined(__PPC__)
         0xe4000000,
-#elif defined(CONFIG_MOMENCO_OCELOT_G)
-        0xff000000,
 #else
 #warning Unknown architecture for DiskOnChip. No default probe locations defined
 #endif
diff --git a/drivers/mtd/nand/edb7312.c b/drivers/mtd/nand/edb7312.c
index 1daf8231aaef..0146cdc48039 100644
--- a/drivers/mtd/nand/edb7312.c
+++ b/drivers/mtd/nand/edb7312.c
@@ -74,7 +74,7 @@ static struct mtd_partition partition_info[] = {
 /*
  *      hardware specific access to control-lines
  *
- *      NAND_NCE: bit 0 -> bit 7
+ *      NAND_NCE: bit 0 -> bit 6 (bit 7 = 1)
  *      NAND_CLE: bit 1 -> bit 4
  *      NAND_ALE: bit 2 -> bit 5
  */
@@ -83,12 +83,12 @@ static void ep7312_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
         struct nand_chip *chip = mtd->priv;
 
         if (ctrl & NAND_CTRL_CHANGE) {
-                unsigned char bits;
+                unsigned char bits = 0x80;
 
-                bits = (ctrl & (NAND_CLE | NAND_ALE)) << 3;
-                bits = (ctrl & NAND_NCE) << 7;
+                bits |= (ctrl & (NAND_CLE | NAND_ALE)) << 3;
+                bits |= (ctrl & NAND_NCE) ? 0x00 : 0x40;
 
-                clps_writeb((clps_readb(ep7312_pxdr)  & 0xB0) | 0x10,
+                clps_writeb((clps_readb(ep7312_pxdr)  & 0xF0) | bits,
                             ep7312_pxdr);
         }
         if (cmd != NAND_CMD_NONE)
diff --git a/drivers/mtd/nand/excite_nandflash.c b/drivers/mtd/nand/excite_nandflash.c
index 7e9afc4c7757..bed87290decc 100644
--- a/drivers/mtd/nand/excite_nandflash.c
+++ b/drivers/mtd/nand/excite_nandflash.c
@@ -27,7 +27,6 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/kernel.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 7e68203fe1ba..d5691212058d 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -7,7 +7,7 @@
  *   Basic support for AG-AND chips is provided.
  *
  *      Additional technical information is available on
- *      http://www.linux-mtd.infradead.org/tech/nand.html
+ *      http://www.linux-mtd.infradead.org/doc/nand.html
  *
  *  Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
  *                2002-2006 Thomas Gleixner (tglx@linutronix.de)
@@ -24,6 +24,7 @@
  *      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.
+ *      BBT table is not serialized, has to be fixed
  *
  * 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
@@ -360,6 +361,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                 /* We write two bytes, so we dont have to mess with 16 bit
                  * access
                  */
+                nand_get_device(chip, mtd, FL_WRITING);
                 ofs += mtd->oobsize;
                 chip->ops.len = chip->ops.ooblen = 2;
                 chip->ops.datbuf = NULL;
@@ -367,9 +369,11 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                 chip->ops.ooboffs = chip->badblockpos & ~0x01;
 
                 ret = nand_do_write_oob(mtd, ofs, &chip->ops);
+                nand_release_device(mtd);
         }
         if (!ret)
                 mtd->ecc_stats.badblocks++;
+
         return ret;
 }
 
@@ -768,7 +772,7 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
         uint8_t *p = buf;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         uint8_t *ecc_code = chip->buffers->ecccode;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         chip->ecc.read_page_raw(mtd, chip, buf);
 
@@ -810,7 +814,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
         uint8_t *p = buf;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         uint8_t *ecc_code = chip->buffers->ecccode;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
                 chip->ecc.hwctl(mtd, NAND_ECC_READ);
@@ -1416,7 +1420,7 @@ static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
         int eccsteps = chip->ecc.steps;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         const uint8_t *p = buf;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         /* Software ecc calculation */
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize)
@@ -1442,7 +1446,7 @@ static void nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
         int eccsteps = chip->ecc.steps;
         uint8_t *ecc_calc = chip->buffers->ecccalc;
         const uint8_t *p = buf;
-        int *eccpos = chip->ecc.layout->eccpos;
+        uint32_t *eccpos = chip->ecc.layout->eccpos;
 
         for (i = 0; eccsteps; eccsteps--, i += eccbytes, p += eccsize) {
                 chip->ecc.hwctl(mtd, NAND_ECC_WRITE);
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 2fc674a190cf..a3e3ab0185d5 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -141,6 +141,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
         {NAND_MFR_STMICRO, "ST Micro"},
         {NAND_MFR_HYNIX, "Hynix"},
         {NAND_MFR_MICRON, "Micron"},
+        {NAND_MFR_AMD, "AMD"},
         {0x0, "Unknown"}
 };
 
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index fd7a8d5ba29a..1c0e89f00e8d 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -24,7 +24,11 @@
 #include <linux/platform_device.h>
 
 #include <asm/io.h>
+#ifdef CONFIG_40x
+#include <asm/ibm405.h>
+#else
 #include <asm/ibm44x.h>
+#endif
 
 struct ndfc_nand_mtd {
         struct mtd_info                 mtd;
@@ -230,7 +234,11 @@ static int ndfc_nand_probe(struct platform_device *pdev)
         struct ndfc_controller *ndfc = &ndfc_ctrl;
         unsigned long long phys = settings->ndfc_erpn | res->start;
 
+#ifndef CONFIG_PHYS_64BIT
+        ndfc->ndfcbase = ioremap((phys_addr_t)phys, res->end - res->start + 1);
+#else
         ndfc->ndfcbase = ioremap64(phys, res->end - res->start + 1);
+#endif
         if (!ndfc->ndfcbase) {
                 printk(KERN_ERR "NDFC: ioremap failed\n");
                 return -EIO;