16 files changed, 131 insertions, 166 deletions

diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 5a349eb316..aeaf2dece0 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -192,7 +192,7 @@ static int __init ams_delta_init(void)
         }
         /* 25 us command delay time */
         this->chip_delay = 30;
-        this->eccmode = NAND_ECC_SOFT;
+        this->ecc.mode = NAND_ECC_SOFT;
 
         /* Set chip enabled, but  */
         ams_delta_latch2_write(NAND_MASK, AMS_DELTA_LATCH2_NAND_NRE |
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index d9a0143e1d..d7f04abfe1 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -578,7 +578,7 @@ static int __init au1xxx_nand_init(void)
 
         /* 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;
 
diff --git a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c
index 43b296040d..dbb1b6267a 100644
--- a/drivers/mtd/nand/autcpu12.c
+++ b/drivers/mtd/nand/autcpu12.c
@@ -163,7 +163,7 @@ static int __init autcpu12_init(void)
         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 */
         /*
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index bf251253ea..064f3feadf 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -242,11 +242,13 @@ static int __init cs553x_init_one(int cs, int mmio, unsigned long adr)
 
         this->chip_delay = 0;
 
-        this->eccmode = NAND_ECC_HW3_256;
-        this->enable_hwecc  = cs_enable_hwecc;
-        this->calculate_ecc = cs_calculate_ecc;
-        this->correct_data  = nand_correct_data;
-        
+        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;
 
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index a2391c66a6..128c937af3 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1674,12 +1674,14 @@ static int __init doc_probe(unsigned long physadr)
         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->ecc.mode          = NAND_ECC_HW_SYNDROME;
+        nand->ecc.size          = 512;
+        nand->ecc.bytes         = 6;
         nand->options           = NAND_USE_FLASH_BBT | NAND_HWECC_SYNDROME;
 
         doc->physadr            = physadr;
diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 9848eb09b8..06e91fa11b 100644
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -149,7 +149,7 @@ static int __init h1910_init(void)
         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 */
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 37db98a58c..98792ec4c2 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -879,9 +879,9 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this, int pag
 {
         int i, status;
         uint8_t ecc_code[32];
-        int eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE;
+        int eccmode = oobsel->useecc ? this->ecc.mode : NAND_ECC_NONE;
         int *oob_config = oobsel->eccpos;
-        int datidx = 0, eccidx = 0, eccsteps = this->eccsteps;
+        int datidx = 0, eccidx = 0, eccsteps = this->ecc.steps;
         int eccbytes = 0;
 
         /* FIXME: Enable cached programming */
@@ -901,20 +901,20 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this, int pag
                 /* Software ecc 3/256, write all */
         case NAND_ECC_SOFT:
                 for (; eccsteps; eccsteps--) {
-                        this->calculate_ecc(mtd, &this->data_poi[datidx], ecc_code);
+                        this->ecc.calculate(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;
+                        datidx += this->ecc.size;
                 }
                 this->write_buf(mtd, this->data_poi, mtd->oobblock);
                 break;
         default:
-                eccbytes = this->eccbytes;
+                eccbytes = this->ecc.bytes;
                 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);
+                        this->ecc.hwctl(mtd, NAND_ECC_WRITE);
+                        this->write_buf(mtd, &this->data_poi[datidx], this->ecc.size);
+                        this->ecc.calculate(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
@@ -922,7 +922,7 @@ static int nand_write_page(struct mtd_info *mtd, struct nand_chip *this, int pag
                          * the data bytes (words) */
                         if (this->options & NAND_HWECC_SYNDROME)
                                 this->write_buf(mtd, ecc_code, eccbytes);
-                        datidx += this->eccsize;
+                        datidx += this->ecc.size;
                 }
                 break;
         }
@@ -1155,7 +1155,7 @@ int nand_do_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
         if (oobsel->useecc == MTD_NANDECC_AUTOPLACE)
                 oobsel = this->autooob;
 
-        eccmode = oobsel->useecc ? this->eccmode : NAND_ECC_NONE;
+        eccmode = oobsel->useecc ? this->ecc.mode : NAND_ECC_NONE;
         oob_config = oobsel->eccpos;
 
         /* Select the NAND device */
@@ -1170,8 +1170,8 @@ int nand_do_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
         col = from & (mtd->oobblock - 1);
 
         end = mtd->oobblock;
-        ecc = this->eccsize;
-        eccbytes = this->eccbytes;
+        ecc = this->ecc.size;
+        eccbytes = this->ecc.bytes;
 
         if ((eccmode == NAND_ECC_NONE) || (this->options & NAND_HWECC_SYNDROME))
                 compareecc = 0;
@@ -1216,7 +1216,7 @@ int nand_do_read_ecc(struct mtd_info *mtd, loff_t from, size_t len,
                         oobsel->useecc == MTD_NANDECC_AUTOPL_USR)