]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - drivers/mtd/nand/mxc_nand.c
Merge branch 'master' of git://git.denx.de/u-boot-video
[karo-tx-uboot.git] / drivers / mtd / nand / mxc_nand.c
index 647be0b7ef347d2e59a192ddf4aca7702cf93a81..d0ded483e2a41342387be2a19f0e1a086cbad92c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2007 Freescale Semiconductor, Inc.
  * Copyright 2008 Sascha Hauer, kernel@pengutronix.de
  * Copyright 2009 Ilya Yanok, <yanok@emcraft.com>
  *
 #include <nand.h>
 #include <linux/err.h>
 #include <asm/io.h>
-#ifdef CONFIG_MX27
+#if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX35)
 #include <asm/arch/imx-regs.h>
 #endif
+#include <fsl_nfc.h>
 
 #define DRIVER_NAME "mxc_nand"
 
-struct nfc_regs {
-/* NFC RAM BUFFER Main area 0 */
-       uint8_t main_area0[0x200];
-       uint8_t main_area1[0x200];
-       uint8_t main_area2[0x200];
-       uint8_t main_area3[0x200];
-/* SPARE BUFFER Spare area 0 */
-       uint8_t spare_area0[0x10];
-       uint8_t spare_area1[0x10];
-       uint8_t spare_area2[0x10];
-       uint8_t spare_area3[0x10];
-       uint8_t pad[0x5c0];
-/* NFC registers */
-       uint16_t nfc_buf_size;
-       uint16_t reserved;
-       uint16_t nfc_buf_addr;
-       uint16_t nfc_flash_addr;
-       uint16_t nfc_flash_cmd;
-       uint16_t nfc_config;
-       uint16_t nfc_ecc_status_result;
-       uint16_t nfc_rsltmain_area;
-       uint16_t nfc_rsltspare_area;
-       uint16_t nfc_wrprot;
-       uint16_t nfc_unlockstart_blkaddr;
-       uint16_t nfc_unlockend_blkaddr;
-       uint16_t nfc_nf_wrprst;
-       uint16_t nfc_config1;
-       uint16_t nfc_config2;
-};
-
-/*
- * Set INT to 0, FCMD to 1, rest to 0 in NFC_CONFIG2 Register
- * for Command operation
- */
-#define NFC_CMD            0x1
-
-/*
- * Set INT to 0, FADD to 1, rest to 0 in NFC_CONFIG2 Register
- * for Address operation
- */
-#define NFC_ADDR           0x2
-
-/*
- * Set INT to 0, FDI to 1, rest to 0 in NFC_CONFIG2 Register
- * for Input operation
- */
-#define NFC_INPUT          0x4
-
-/*
- * Set INT to 0, FDO to 001, rest to 0 in NFC_CONFIG2 Register
- * for Data Output operation
- */
-#define NFC_OUTPUT         0x8
-
-/*
- * Set INT to 0, FD0 to 010, rest to 0 in NFC_CONFIG2 Register
- * for Read ID operation
- */
-#define NFC_ID             0x10
-
-/*
- * Set INT to 0, FDO to 100, rest to 0 in NFC_CONFIG2 Register
- * for Read Status operation
- */
-#define NFC_STATUS         0x20
-
-/*
- * Set INT to 1, rest to 0 in NFC_CONFIG2 Register for Read
- * Status operation
- */
-#define NFC_INT            0x8000
-
-#define NFC_SP_EN           (1 << 2)
-#define NFC_ECC_EN          (1 << 3)
-#define NFC_BIG             (1 << 5)
-#define NFC_RST             (1 << 6)
-#define NFC_CE              (1 << 7)
-#define NFC_ONE_CYCLE       (1 << 8)
-
 typedef enum {false, true} bool;
 
 struct mxc_nand_host {
-       struct mtd_info         mtd;
-       struct nand_chip        *nand;
-
-       struct nfc_regs __iomem *regs;
-       int                     spare_only;
-       int                     status_request;
-       int                     pagesize_2k;
-       int                     clk_act;
-       uint16_t                col_addr;
+       struct mtd_info                 mtd;
+       struct nand_chip                *nand;
+
+       struct fsl_nfc_regs __iomem     *regs;
+       int                             spare_only;
+       int                             status_request;
+       int                             pagesize_2k;
+       int                             clk_act;
+       uint16_t                        col_addr;
+       unsigned int                    page_addr;
 };
 
 static struct mxc_nand_host mxc_host;
@@ -135,18 +58,84 @@ static struct mxc_nand_host *host = &mxc_host;
 #define SPARE_SINGLEBIT_ERROR 0x1
 
 /* OOB placement block for use with hardware ecc generation */
-#ifdef CONFIG_MXC_NAND_HWECC
+#if defined(MXC_NFC_V1)
+#ifndef CONFIG_SYS_NAND_LARGEPAGE
 static struct nand_ecclayout nand_hw_eccoob = {
        .eccbytes = 5,
        .eccpos = {6, 7, 8, 9, 10},
-       .oobfree = {{0, 5}, {11, 5}, }
+       .oobfree = { {0, 5}, {11, 5}, }
 };
 #else
-static struct nand_ecclayout nand_soft_eccoob = {
-       .eccbytes = 6,
-       .eccpos = {6, 7, 8, 9, 10, 11},
-       .oobfree = {{0, 5}, {12, 4}, }
+static struct nand_ecclayout nand_hw_eccoob2k = {
+       .eccbytes = 20,
+       .eccpos = {
+               6, 7, 8, 9, 10,
+               22, 23, 24, 25, 26,
+               38, 39, 40, 41, 42,
+               54, 55, 56, 57, 58,
+       },
+       .oobfree = { {2, 4}, {11, 11}, {27, 11}, {43, 11}, {59, 5} },
+};
+#endif
+#elif defined(MXC_NFC_V2_1)
+#ifndef CONFIG_SYS_NAND_LARGEPAGE
+static struct nand_ecclayout nand_hw_eccoob = {
+       .eccbytes = 9,
+       .eccpos = {7, 8, 9, 10, 11, 12, 13, 14, 15},
+       .oobfree = { {2, 5} }
 };
+#else
+static struct nand_ecclayout nand_hw_eccoob2k = {
+       .eccbytes = 36,
+       .eccpos = {
+               7, 8, 9, 10, 11, 12, 13, 14, 15,
+               23, 24, 25, 26, 27, 28, 29, 30, 31,
+               39, 40, 41, 42, 43, 44, 45, 46, 47,
+               55, 56, 57, 58, 59, 60, 61, 62, 63,
+       },
+       .oobfree = { {2, 5}, {16, 7}, {32, 7}, {48, 7} },
+};
+#endif
+#endif
+
+#ifdef CONFIG_MX27
+static int is_16bit_nand(void)
+{
+       struct system_control_regs *sc_regs =
+               (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
+
+       if (readl(&sc_regs->fmcr) & NF_16BIT_SEL)
+               return 1;
+       else
+               return 0;
+}
+#elif defined(CONFIG_MX31)
+static int is_16bit_nand(void)
+{
+       struct clock_control_regs *sc_regs =
+               (struct clock_control_regs *)CCM_BASE;
+
+       if (readl(&sc_regs->rcsr) & CCM_RCSR_NF16B)
+               return 1;
+       else
+               return 0;
+}
+#elif defined(CONFIG_MX25) || defined(CONFIG_MX35)
+static int is_16bit_nand(void)
+{
+       struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
+
+       if (readl(&ccm->rcsr) & CCM_RCSR_NF_16BIT_SEL)
+               return 1;
+       else
+               return 0;
+}
+#else
+#warning "8/16 bit NAND autodetection not supported"
+static int is_16bit_nand(void)
+{
+       return 0;
+}
 #endif
 
 static uint32_t *mxc_nand_memcpy32(uint32_t *dest, uint32_t *source, size_t size)
@@ -169,10 +158,10 @@ static void wait_op_done(struct mxc_nand_host *host, int max_retries,
        uint32_t tmp;
 
        while (max_retries-- > 0) {
-               if (readw(&host->regs->nfc_config2) & NFC_INT) {
-                       tmp = readw(&host->regs->nfc_config2);
+               if (readw(&host->regs->config2) & NFC_INT) {
+                       tmp = readw(&host->regs->config2);
                        tmp  &= ~NFC_INT;
-                       writew(tmp, &host->regs->nfc_config2);
+                       writew(tmp, &host->regs->config2);
                        break;
                }
                udelay(1);
@@ -191,8 +180,8 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd)
 {
        MTDDEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x)\n", cmd);
 
-       writew(cmd, &host->regs->nfc_flash_cmd);
-       writew(NFC_CMD, &host->regs->nfc_config2);
+       writew(cmd, &host->regs->flash_cmd);
+       writew(NFC_CMD, &host->regs->config2);
 
        /* Wait for operation to complete */
        wait_op_done(host, TROP_US_DELAY, cmd);
@@ -207,42 +196,59 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr)
 {
        MTDDEBUG(MTD_DEBUG_LEVEL3, "send_addr(host, 0x%x)\n", addr);
 
-       writew(addr, &host->regs->nfc_flash_addr);
-       writew(NFC_ADDR, &host->regs->nfc_config2);
+       writew(addr, &host->regs->flash_addr);
+       writew(NFC_ADDR, &host->regs->config2);
 
        /* Wait for operation to complete */
        wait_op_done(host, TROP_US_DELAY, addr);
 }
 
 /*
- * This function requests the NANDFC to initate the transfer
+ * This function requests the NANDFC to initiate the transfer
  * of data currently in the NANDFC RAM buffer to the NAND device.
  */
 static void send_prog_page(struct mxc_nand_host *host, uint8_t buf_id,
                        int spare_only)
 {
-       MTDDEBUG(MTD_DEBUG_LEVEL3, "send_prog_page (%d)\n", spare_only);
+       if (spare_only)
+               MTDDEBUG(MTD_DEBUG_LEVEL1, "send_prog_page (%d)\n", spare_only);
 
-       writew(buf_id, &host->regs->nfc_buf_addr);
+       if (is_mxc_nfc_21()) {
+               int i;
+               /*
+                *  The controller copies the 64 bytes of spare data from
+                *  the first 16 bytes of each of the 4 64 byte spare buffers.
+                *  Copy the contiguous data starting in spare_area[0] to
+                *  the four spare area buffers.
+                */
+               for (i = 1; i < 4; i++) {
+                       void __iomem *src = &host->regs->spare_area[0][i * 16];
+                       void __iomem *dst = &host->regs->spare_area[i][0];
+
+                       mxc_nand_memcpy32(dst, src, 16);
+               }
+       }
+
+       writew(buf_id, &host->regs->buf_addr);
 
        /* Configure spare or page+spare access */
        if (!host->pagesize_2k) {
-               uint16_t config1 = readw(&host->regs->nfc_config1);
+               uint16_t config1 = readw(&host->regs->config1);
                if (spare_only)
                        config1 |= NFC_SP_EN;
                else
-                       config1 &= ~(NFC_SP_EN);
-               writew(config1, &host->regs->nfc_config1);
+                       config1 &= ~NFC_SP_EN;
+               writew(config1, &host->regs->config1);
        }
 
-       writew(NFC_INPUT, &host->regs->nfc_config2);
+       writew(NFC_INPUT, &host->regs->config2);
 
        /* Wait for operation to complete */
        wait_op_done(host, TROP_US_DELAY, spare_only);
 }
 
 /*
- * Requests NANDFC to initated the transfer of data from the
+ * Requests NANDFC to initiate the transfer of data from the
  * NAND device into in the NANDFC ram buffer.
  */
 static void send_read_page(struct mxc_nand_host *host, uint8_t buf_id,
@@ -250,22 +256,38 @@ static void send_read_page(struct mxc_nand_host *host, uint8_t buf_id,
 {
        MTDDEBUG(MTD_DEBUG_LEVEL3, "send_read_page (%d)\n", spare_only);
 
-       writew(buf_id, &host->regs->nfc_buf_addr);
+       writew(buf_id, &host->regs->buf_addr);
 
        /* Configure spare or page+spare access */
        if (!host->pagesize_2k) {
-               uint32_t config1 = readw(&host->regs->nfc_config1);
+               uint32_t config1 = readw(&host->regs->config1);
                if (spare_only)
                        config1 |= NFC_SP_EN;
                else
                        config1 &= ~NFC_SP_EN;
-               writew(config1, &host->regs->nfc_config1);
+               writew(config1, &host->regs->config1);
        }
 
-       writew(NFC_OUTPUT, &host->regs->nfc_config2);
+       writew(NFC_OUTPUT, &host->regs->config2);
 
        /* Wait for operation to complete */
        wait_op_done(host, TROP_US_DELAY, spare_only);
+
+       if (is_mxc_nfc_21()) {
+               int i;
+
+               /*
+                *  The controller copies the 64 bytes of spare data to
+                *  the first 16 bytes of each of the 4 spare buffers.
+                *  Make the data contiguous starting in spare_area[0].
+                */
+               for (i = 1; i < 4; i++) {
+                       void __iomem *src = &host->regs->spare_area[i][0];
+                       void __iomem *dst = &host->regs->spare_area[0][i * 16];
+
+                       mxc_nand_memcpy32(dst, src, 16);
+               }
+       }
 }
 
 /* Request the NANDFC to perform a read of the NAND device ID. */
@@ -274,14 +296,14 @@ static void send_read_id(struct mxc_nand_host *host)
        uint16_t tmp;
 
        /* NANDFC buffer 0 is used for device ID output */
-       writew(0x0, &host->regs->nfc_buf_addr);
+       writew(0x0, &host->regs->buf_addr);
 
        /* Read ID into main buffer */
-       tmp = readw(&host->regs->nfc_config1);
+       tmp = readw(&host->regs->config1);
        tmp &= ~NFC_SP_EN;
-       writew(tmp, &host->regs->nfc_config1);
+       writew(tmp, &host->regs->config1);
 
-       writew(NFC_ID, &host->regs->nfc_config2);
+       writew(NFC_ID, &host->regs->config2);
 
        /* Wait for operation to complete */
        wait_op_done(host, TROP_US_DELAY, 0);
@@ -293,7 +315,7 @@ static void send_read_id(struct mxc_nand_host *host)
  */
 static uint16_t get_dev_status(struct mxc_nand_host *host)
 {
-       void __iomem *main_buf = host->regs->main_area1;
+       void __iomem *main_buf = host->regs->main_area[1];
        uint32_t store;
        uint16_t ret, tmp;
        /* Issue status request to NAND device */
@@ -301,14 +323,14 @@ static uint16_t get_dev_status(struct mxc_nand_host *host)
        /* store the main area1 first word, later do recovery */
        store = readl(main_buf);
        /* NANDFC buffer 1 is used for device status */
-       writew(1, &host->regs->nfc_buf_addr);
+       writew(1, &host->regs->buf_addr);
 
        /* Read status into main buffer */
-       tmp = readw(&host->regs->nfc_config1);
+       tmp = readw(&host->regs->config1);
        tmp &= ~NFC_SP_EN;
-       writew(tmp, &host->regs->nfc_config1);
+       writew(tmp, &host->regs->config1);
 
-       writew(NFC_STATUS, &host->regs->nfc_config2);
+       writew(NFC_STATUS, &host->regs->config2);
 
        /* Wait for operation to complete */
        wait_op_done(host, TROP_US_DELAY, 0);
@@ -333,6 +355,19 @@ static int mxc_nand_dev_ready(struct mtd_info *mtd)
        return 1;
 }
 
+static void _mxc_nand_enable_hwecc(struct mtd_info *mtd, int on)
+{
+       struct nand_chip *nand_chip = mtd->priv;
+       struct mxc_nand_host *host = nand_chip->priv;
+       uint16_t tmp = readw(&host->regs->config1);
+
+       if (on)
+               tmp |= NFC_ECC_EN;
+       else
+               tmp &= ~NFC_ECC_EN;
+       writew(tmp, &host->regs->config1);
+}
+
 #ifdef CONFIG_MXC_NAND_HWECC
 static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode)
 {
@@ -342,6 +377,316 @@ static void mxc_nand_enable_hwecc(struct mtd_info *mtd, int mode)
         */
 }
 
+#ifdef MXC_NFC_V2_1
+static int mxc_nand_read_oob_syndrome(struct mtd_info *mtd,
+                                     struct nand_chip *chip,
+                                     int page, int sndcmd)
+{
+       struct mxc_nand_host *host = chip->priv;
+       uint8_t *buf = chip->oob_poi;
+       int length = mtd->oobsize;
+       int eccpitch = chip->ecc.bytes + chip->ecc.prepad + chip->ecc.postpad;
+       uint8_t *bufpoi = buf;
+       int i, toread;
+
+       MTDDEBUG(MTD_DEBUG_LEVEL0,
+                       "%s: Reading OOB area of page %u to oob %p\n",
+                        __FUNCTION__, host->page_addr, buf);
+
+       chip->cmdfunc(mtd, NAND_CMD_READOOB, mtd->writesize, page);
+       for (i = 0; i < chip->ecc.steps; i++) {
+               toread = min_t(int, length, chip->ecc.prepad);
+               if (toread) {
+                       chip->read_buf(mtd, bufpoi, toread);
+                       bufpoi += toread;
+                       length -= toread;
+               }
+               bufpoi += chip->ecc.bytes;
+               host->col_addr += chip->ecc.bytes;
+               length -= chip->ecc.bytes;
+
+               toread = min_t(int, length, chip->ecc.postpad);
+               if (toread) {
+                       chip->read_buf(mtd, bufpoi, toread);
+                       bufpoi += toread;
+                       length -= toread;
+               }
+       }
+       if (length > 0)
+               chip->read_buf(mtd, bufpoi, length);
+
+       _mxc_nand_enable_hwecc(mtd, 0);
+       chip->cmdfunc(mtd, NAND_CMD_READOOB,
+                       mtd->writesize + chip->ecc.prepad, page);
+       bufpoi = buf + chip->ecc.prepad;
+       length = mtd->oobsize - chip->ecc.prepad;
+       for (i = 0; i < chip->ecc.steps; i++) {
+               toread = min_t(int, length, chip->ecc.bytes);
+               chip->read_buf(mtd, bufpoi, toread);
+               bufpoi += eccpitch;
+               length -= eccpitch;
+               host->col_addr += chip->ecc.postpad + chip->ecc.prepad;
+       }
+       _mxc_nand_enable_hwecc(mtd, 1);
+       return 1;
+}
+
+static int mxc_nand_read_page_raw_syndrome(struct mtd_info *mtd,
+                                          struct nand_chip *chip,
+                                          uint8_t *buf,
+                                          int page)
+{
+       struct mxc_nand_host *host = chip->priv;
+       int eccsize = chip->ecc.size;
+       int eccbytes = chip->ecc.bytes;
+       int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
+       uint8_t *oob = chip->oob_poi;
+       int steps, size;
+       int n;
+
+       _mxc_nand_enable_hwecc(mtd, 0);
+       chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, host->page_addr);
+
+       for (n = 0, steps = chip->ecc.steps; steps > 0; n++, steps--) {
+               host->col_addr = n * eccsize;
+               chip->read_buf(mtd, buf, eccsize);
+               buf += eccsize;
+
+               host->col_addr = mtd->writesize + n * eccpitch;
+               if (chip->ecc.prepad) {
+                       chip->read_buf(mtd, oob, chip->ecc.prepad);
+                       oob += chip->ecc.prepad;
+               }
+
+               chip->read_buf(mtd, oob, eccbytes);
+               oob += eccbytes;
+
+               if (chip->ecc.postpad) {
+                       chip->read_buf(mtd, oob, chip->ecc.postpad);
+                       oob += chip->ecc.postpad;
+               }
+       }
+
+       size = mtd->oobsize - (oob - chip->oob_poi);
+       if (size)
+               chip->read_buf(mtd, oob, size);
+       _mxc_nand_enable_hwecc(mtd, 1);
+
+       return 0;
+}
+
+static int mxc_nand_read_page_syndrome(struct mtd_info *mtd,
+                                      struct nand_chip *chip,
+                                      uint8_t *buf,
+                                      int page)
+{
+       struct mxc_nand_host *host = chip->priv;
+       int n, eccsize = chip->ecc.size;
+       int eccbytes = chip->ecc.bytes;
+       int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
+       int eccsteps = chip->ecc.steps;
+       uint8_t *p = buf;
+       uint8_t *oob = chip->oob_poi;
+
+       MTDDEBUG(MTD_DEBUG_LEVEL1, "Reading page %u to buf %p oob %p\n",
+             host->page_addr, buf, oob);
+
+       /* first read the data area and the available portion of OOB */
+       for (n = 0; eccsteps; n++, eccsteps--, p += eccsize) {
+               int stat;
+
+               host->col_addr = n * eccsize;
+
+               chip->read_buf(mtd, p, eccsize);
+
+               host->col_addr = mtd->writesize + n * eccpitch;
+
+               if (chip->ecc.prepad) {
+                       chip->read_buf(mtd, oob, chip->ecc.prepad);
+                       oob += chip->ecc.prepad;
+               }
+
+               stat = chip->ecc.correct(mtd, p, oob, NULL);
+
+               if (stat < 0)
+                       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 */
+       n = mtd->oobsize - (oob - chip->oob_poi);
+       if (n)
+               chip->read_buf(mtd, oob, n);
+
+       /* Then switch ECC off and read the OOB area to get the ECC code */
+       _mxc_nand_enable_hwecc(mtd, 0);
+       chip->cmdfunc(mtd, NAND_CMD_READOOB, mtd->writesize, host->page_addr);
+       eccsteps = chip->ecc.steps;
+       oob = chip->oob_poi + chip->ecc.prepad;
+       for (n = 0; eccsteps; n++, eccsteps--, p += eccsize) {
+               host->col_addr = mtd->writesize +
+                                n * eccpitch +
+                                chip->ecc.prepad;
+               chip->read_buf(mtd, oob, eccbytes);
+               oob += eccbytes + chip->ecc.postpad;
+       }
+       _mxc_nand_enable_hwecc(mtd, 1);
+       return 0;
+}
+
+static int mxc_nand_write_oob_syndrome(struct mtd_info *mtd,
+                                      struct nand_chip *chip, int page)
+{
+       struct mxc_nand_host *host = chip->priv;
+       int eccpitch = chip->ecc.bytes + chip->ecc.prepad + chip->ecc.postpad;
+       int length = mtd->oobsize;
+       int i, len, status, steps = chip->ecc.steps;
+       const uint8_t *bufpoi = chip->oob_poi;
+
+       chip->cmdfunc(mtd, NAND_CMD_SEQIN, mtd->writesize, page);
+       for (i = 0; i < steps; i++) {
+               len = min_t(int, length, eccpitch);
+
+               chip->write_buf(mtd, bufpoi, len);
+               bufpoi += len;
+               length -= len;
+               host->col_addr += chip->ecc.prepad + chip->ecc.postpad;
+       }
+       if (length > 0)
+               chip->write_buf(mtd, bufpoi, length);
+
+       chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
+       status = chip->waitfunc(mtd, chip);
+       return status & NAND_STATUS_FAIL ? -EIO : 0;
+}
+
+static void mxc_nand_write_page_raw_syndrome(struct mtd_info *mtd,
+                                            struct nand_chip *chip,
+                                            const uint8_t *buf)
+{
+       struct mxc_nand_host *host = chip->priv;
+       int eccsize = chip->ecc.size;
+       int eccbytes = chip->ecc.bytes;
+       int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
+       uint8_t *oob = chip->oob_poi;
+       int steps, size;
+       int n;
+
+       for (n = 0, steps = chip->ecc.steps; steps > 0; n++, steps--) {
+               host->col_addr = n * eccsize;
+               chip->write_buf(mtd, buf, eccsize);
+               buf += eccsize;
+
+               host->col_addr = mtd->writesize + n * eccpitch;
+
+               if (chip->ecc.prepad) {
+                       chip->write_buf(mtd, oob, chip->ecc.prepad);
+                       oob += chip->ecc.prepad;
+               }
+
+               host->col_addr += eccbytes;
+               oob += eccbytes;
+
+               if (chip->ecc.postpad) {
+                       chip->write_buf(mtd, oob, chip->ecc.postpad);
+                       oob += chip->ecc.postpad;
+               }
+       }
+
+       size = mtd->oobsize - (oob - chip->oob_poi);
+       if (size)
+               chip->write_buf(mtd, oob, size);
+}
+
+static void mxc_nand_write_page_syndrome(struct mtd_info *mtd,
+                                        struct nand_chip *chip,
+                                        const uint8_t *buf)
+{
+       struct mxc_nand_host *host = chip->priv;
+       int i, n, eccsize = chip->ecc.size;
+       int eccbytes = chip->ecc.bytes;
+       int eccpitch = eccbytes + chip->ecc.prepad + chip->ecc.postpad;
+       int eccsteps = chip->ecc.steps;
+       const uint8_t *p = buf;
+       uint8_t *oob = chip->oob_poi;
+
+       chip->ecc.hwctl(mtd, NAND_ECC_WRITE);
+
+       for (i = n = 0;
+            eccsteps;
+            n++, eccsteps--, i += eccbytes, p += eccsize) {
+               host->col_addr = n * eccsize;
+
+               chip->write_buf(mtd, p, eccsize);
+
+               host->col_addr = mtd->writesize + n * eccpitch;
+
+               if (chip->ecc.prepad) {
+                       chip->write_buf(mtd, oob, chip->ecc.prepad);
+                       oob += chip->ecc.prepad;
+               }
+
+               chip->write_buf(mtd, oob, eccbytes);
+               oob += eccbytes;
+
+               if (chip->ecc.postpad) {
+                       chip->write_buf(mtd, oob, chip->ecc.postpad);
+                       oob += chip->ecc.postpad;
+               }
+       }
+
+       /* Calculate remaining oob bytes */
+       i = mtd->oobsize - (oob - chip->oob_poi);
+       if (i)
+               chip->write_buf(mtd, oob, i);
+}
+
+static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
+                                u_char *read_ecc, u_char *calc_ecc)
+{
+       struct nand_chip *nand_chip = mtd->priv;
+       struct mxc_nand_host *host = nand_chip->priv;
+       uint32_t ecc_status = readl(&host->regs->ecc_status_result);
+       int subpages = mtd->writesize / nand_chip->subpagesize;
+       int pg2blk_shift = nand_chip->phys_erase_shift -
+                          nand_chip->page_shift;
+
+       do {
+               if ((ecc_status & 0xf) > 4) {
+                       static int last_bad = -1;
+
+                       if (last_bad != host->page_addr >> pg2blk_shift) {
+                               last_bad = host->page_addr >> pg2blk_shift;
+                               printk(KERN_DEBUG
+                                      "MXC_NAND: HWECC uncorrectable ECC error"
+                                      " in block %u page %u subpage %d\n",
+                                      last_bad, host->page_addr,
+                                      mtd->writesize / nand_chip->subpagesize
+                                           - subpages);
+                       }
+                       return -1;
+               }
+               ecc_status >>= 4;
+               subpages--;
+       } while (subpages > 0);
+
+       return 0;
+}
+#else
+#define mxc_nand_read_page_syndrome NULL
+#define mxc_nand_read_page_raw_syndrome NULL
+#define mxc_nand_read_oob_syndrome NULL
+#define mxc_nand_write_page_syndrome NULL
+#define mxc_nand_write_page_raw_syndrome NULL
+#define mxc_nand_write_oob_syndrome NULL
+
 static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
                                 u_char *read_ecc, u_char *calc_ecc)
 {
@@ -353,7 +698,7 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
         * additional correction.  2-Bit errors cannot be corrected by
         * HW ECC, so we need to return failure
         */
-       uint16_t ecc_status = readw(&host->regs->nfc_ecc_status_result);
+       uint16_t ecc_status = readw(&host->regs->ecc_status_result);
 
        if (((ecc_status & 0x3) == 2) || ((ecc_status >> 2) == 2)) {
                MTDDEBUG(MTD_DEBUG_LEVEL0,
@@ -363,6 +708,7 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
 
        return 0;
 }
+#endif
 
 static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
                                  u_char *ecc_code)
@@ -378,9 +724,9 @@ static u_char mxc_nand_read_byte(struct mtd_info *mtd)
        uint8_t ret = 0;
        uint16_t col;
        uint16_t __iomem *main_buf =
-               (uint16_t __iomem *)host->regs->main_area0;
+               (uint16_t __iomem *)host->regs->main_area[0];
        uint16_t __iomem *spare_buf =
-               (uint16_t __iomem *)host->regs->spare_area0;
+               (uint16_t __iomem *)host->regs->spare_area[0];
        union {
                uint16_t word;
                uint8_t bytes[2];
@@ -427,9 +773,10 @@ static uint16_t mxc_nand_read_word(struct mtd_info *mtd)
                col += mtd->writesize;
 
        if (col < mtd->writesize) {
-               p = (uint16_t __iomem *)(host->regs->main_area0 + (col >> 1));
+               p = (uint16_t __iomem *)(host->regs->main_area[0] +
+                               (col >> 1));
        } else {
-               p = (uint16_t __iomem *)(host->regs->spare_area0 +
+               p = (uint16_t __iomem *)(host->regs->spare_area[0] +
                                ((col - mtd->writesize) >> 1));
        }
 
@@ -488,9 +835,9 @@ static void mxc_nand_write_buf(struct mtd_info *mtd,
                void __iomem *p;
 
                if (col < mtd->writesize) {
-                       p = host->regs->main_area0 + (col & ~3);
+                       p = host->regs->main_area[0] + (col & ~3);
                } else {
-                       p = host->regs->spare_area0 -
+                       p = host->regs->spare_area[0] -
                                                mtd->writesize + (col & ~3);
                }
 
@@ -558,9 +905,9 @@ static void mxc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
                void __iomem *p;
 
                if (col < mtd->writesize) {
-                       p = host->regs->main_area0 + (col & ~3);
+                       p = host->regs->main_area[0] + (col & ~3);
                } else {
-                       p = host->regs->spare_area0 -
+                       p = host->regs->spare_area[0] -
                                        mtd->writesize + (col & ~3);
                }
 
@@ -646,7 +993,7 @@ static void mxc_nand_select_chip(struct mtd_info *mtd, int chip)
  * Used by the upper layer to write command to NAND Flash for
  * different operations to be carried out on NAND Flash
  */
-static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
+void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                                int column, int page_addr)
 {
        struct nand_chip *nand_chip = mtd->priv;
@@ -668,6 +1015,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                break;
 
        case NAND_CMD_READ0:
+               host->page_addr = page_addr;
                host->col_addr = column;
                host->spare_only = false;
                break;
@@ -684,7 +1032,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                        /*
                         * before sending SEQIN command for partial write,
                         * we need read one page out. FSL NFC does not support
-                        * partial write. It alway send out 512+ecc+512+ecc ...
+                        * partial write. It always sends out 512+ecc+512+ecc
                         * for large page nand flash. But for small page nand
                         * flash, it does support SPARE ONLY operation.
                         */
@@ -713,8 +1061,8 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
        case NAND_CMD_PAGEPROG:
                send_prog_page(host, 0, host->spare_only);
 
-               if (host->pagesize_2k) {
-                       /* data in 4 areas datas */
+               if (host->pagesize_2k && is_mxc_nfc_1()) {
+                       /* data in 4 areas */
                        send_prog_page(host, 1, host->spare_only);
                        send_prog_page(host, 2, host->spare_only);
                        send_prog_page(host, 3, host->spare_only);
@@ -730,10 +1078,9 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
        if (column != -1) {
                /*
                 * MXC NANDFC can only perform full page+spare or
-                * spare-only read/write.  When the upper layers
-                * layers perform a read/write buf operation,
-                * we will used the saved column adress to index into
-                * the full page.
+                * spare-only read/write. When the upper layers perform
+                * a read/write buffer operation, we will use the saved
+                * column address to index into the full page.
                 */
                send_addr(host, 0);
                if (host->pagesize_2k)
@@ -743,30 +1090,12 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
 
        /* Write out page address, if necessary */
        if (page_addr != -1) {
-               /* paddr_0 - p_addr_7 */
-               send_addr(host, (page_addr & 0xff));
-
-               if (host->pagesize_2k) {
-                       send_addr(host, (page_addr >> 8) & 0xFF);
-                       if (mtd->size >= 0x10000000) {
-                               /* paddr_8 - paddr_15 */
-                               send_addr(host, (page_addr >> 8) & 0xff);
-                               send_addr(host, (page_addr >> 16) & 0xff);
-                       } else {
-                               /* paddr_8 - paddr_15 */
-                               send_addr(host, (page_addr >> 8) & 0xff);
-                       }
-               } else {
-                       /* One more address cycle for higher density devices */
-                       if (mtd->size >= 0x4000000) {
-                               /* paddr_8 - paddr_15 */
-                               send_addr(host, (page_addr >> 8) & 0xff);
-                               send_addr(host, (page_addr >> 16) & 0xff);
-                       } else {
-                               /* paddr_8 - paddr_15 */
-                               send_addr(host, (page_addr >> 8) & 0xff);
-                       }
-               }
+               u32 page_mask = nand_chip->pagemask;
+               do {
+                       send_addr(host, page_addr & 0xFF);
+                       page_addr >>= 8;
+                       page_mask >>= 8;
+               } while (page_mask);
        }
 
        /* Command post-processing step */
@@ -782,9 +1111,11 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
                        send_cmd(host, NAND_CMD_READSTART);
                        /* read for each AREA */
                        send_read_page(host, 0, host->spare_only);
-                       send_read_page(host, 1, host->spare_only);
-                       send_read_page(host, 2, host->spare_only);
-                       send_read_page(host, 3, host->spare_only);
+                       if (is_mxc_nfc_1()) {
+                               send_read_page(host, 1, host->spare_only);
+                               send_read_page(host, 2, host->spare_only);
+                               send_read_page(host, 3, host->spare_only);
+                       }
                } else {
                        send_read_page(host, 0, host->spare_only);
                }
@@ -806,13 +1137,45 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
        }
 }
 
+#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT
+
+static u8 bbt_pattern[] = {'B', 'b', 't', '0' };
+static u8 mirror_pattern[] = {'1', 't', 'b', 'B' };
+
+static struct nand_bbt_descr bbt_main_descr = {
+       .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE |
+                  NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+       .offs = 0,
+       .len = 4,
+       .veroffs = 4,
+       .maxblocks = 4,
+       .pattern = bbt_pattern,
+};
+
+static struct nand_bbt_descr bbt_mirror_descr = {
+       .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE |
+                  NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+       .offs = 0,
+       .len = 4,
+       .veroffs = 4,
+       .maxblocks = 4,
+       .pattern = mirror_pattern,
+};
+
+#endif
+
 int board_nand_init(struct nand_chip *this)
 {
-       struct system_control_regs *sc_regs =
-               (struct system_control_regs *)IMX_SYSTEM_CTL_BASE;
        struct mtd_info *mtd;
+#ifdef MXC_NFC_V2_1
        uint16_t tmp;
-       int err = 0;
+#endif
+
+#ifdef CONFIG_SYS_NAND_USE_FLASH_BBT
+       this->options |= NAND_USE_FLASH_BBT;
+       this->bbt_td = &bbt_main_descr;
+       this->bbt_md = &bbt_mirror_descr;
+#endif
 
        /* structures must be linked */
        mtd = &host->mtd;
@@ -832,49 +1195,85 @@ int board_nand_init(struct nand_chip *this)
        this->read_buf = mxc_nand_read_buf;
        this->verify_buf = mxc_nand_verify_buf;
 
-       host->regs = (struct nfc_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
+       host->regs = (struct fsl_nfc_regs __iomem *)CONFIG_MXC_NAND_REGS_BASE;
        host->clk_act = 1;
 
 #ifdef CONFIG_MXC_NAND_HWECC
        this->ecc.calculate = mxc_nand_calculate_ecc;
        this->ecc.hwctl = mxc_nand_enable_hwecc;
        this->ecc.correct = mxc_nand_correct_data;
-       this->ecc.mode = NAND_ECC_HW;
+       if (is_mxc_nfc_21()) {
+               this->ecc.mode = NAND_ECC_HW_SYNDROME;
+               this->ecc.read_page = mxc_nand_read_page_syndrome;
+               this->ecc.read_page_raw = mxc_nand_read_page_raw_syndrome;
+               this->ecc.read_oob = mxc_nand_read_oob_syndrome;
+               this->ecc.write_page = mxc_nand_write_page_syndrome;
+               this->ecc.write_page_raw = mxc_nand_write_page_raw_syndrome;
+               this->ecc.write_oob = mxc_nand_write_oob_syndrome;
+               this->ecc.bytes = 9;
+               this->ecc.prepad = 7;
+       } else {
+               this->ecc.mode = NAND_ECC_HW;
+       }
+
+       host->pagesize_2k = 0;
+
        this->ecc.size = 512;
-       this->ecc.bytes = 3;
-       this->ecc.layout = &nand_hw_eccoob;
-       tmp = readw(&host->regs->nfc_config1);
-       tmp |= NFC_ECC_EN;
-       writew(tmp, &host->regs->nfc_config1);
+       _mxc_nand_enable_hwecc(mtd, 1);
 #else
        this->ecc.layout = &nand_soft_eccoob;
        this->ecc.mode = NAND_ECC_SOFT;
-       tmp = readw(&host->regs->nfc_config1);
-       tmp &= ~NFC_ECC_EN;
-       writew(tmp, &host->regs->nfc_config1);
+       _mxc_nand_enable_hwecc(mtd, 0);
 #endif
-
        /* Reset NAND */
        this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);
 
+       /* NAND bus width determines access functions used by upper layer */
+       if (is_16bit_nand())
+               this->options |= NAND_BUSWIDTH_16;
+
+#ifdef CONFIG_SYS_NAND_LARGEPAGE
+       host->pagesize_2k = 1;
+       this->ecc.layout = &nand_hw_eccoob2k;
+#else
+       host->pagesize_2k = 0;
+       this->ecc.layout = &nand_hw_eccoob;
+#endif
+
+#ifdef MXC_NFC_V2_1
+       tmp = readw(&host->regs->config1);
+       tmp |= NFC_ONE_CYCLE;
+       tmp |= NFC_4_8N_ECC;
+       writew(tmp, &host->regs->config1);
+       if (host->pagesize_2k)
+               writew(64/2, &host->regs->spare_area_size);
+       else
+               writew(16/2, &host->regs->spare_area_size);
+#endif
+
        /*
         * preset operation
         * Unlock the internal RAM Buffer
         */
-       writew(0x2, &host->regs->nfc_config);
+       writew(0x2, &host->regs->config);
 
        /* Blocks to be unlocked */
-       writew(0x0, &host->regs->nfc_unlockstart_blkaddr);
-       writew(0x4000, &host->regs->nfc_unlockend_blkaddr);
+       writew(0x0, &host->regs->unlockstart_blkaddr);
+       /* Originally (Freescale LTIB 2.6.21) 0x4000 was written to the
+        * unlockend_blkaddr, but the magic 0x4000 does not always work
+        * when writing more than some 32 megabytes (on 2k page nands)
+        * However 0xFFFF doesn't seem to have this kind
+        * of limitation (tried it back and forth several times).
+        * The linux kernel driver sets this to 0xFFFF for the v2 controller
+        * only, but probably this was not tested there for v1.
+        * The very same limitation seems to apply to this kernel driver.
+        * This might be NAND chip specific and the i.MX31 datasheet is
+        * extremely vague about the semantics of this register.
+        */
+       writew(0xFFFF, &host->regs->unlockend_blkaddr);
 
        /* Unlock Block Command for given address range */
-       writew(0x4, &host->regs->nfc_wrprot);
+       writew(0x4, &host->regs->wrprot);
 
-       /* NAND bus width determines access funtions used by upper layer */
-       if (readl(&sc_regs->fmcr) & NF_16BIT_SEL)
-               this->options |= NAND_BUSWIDTH_16;
-
-       host->pagesize_2k = 0;
-
-       return err;
+       return 0;
 }