To support software ECC we still need the driver provided read_oob,
read_page_raw and write_page_raw ops, so set them unconditionally
no matter which engine_type we use. The OOB layout on the other hand
represents the layout the i.MX ECC hardware uses, so set this only
when NAND_ECC_ENGINE_TYPE_ON_HOST is in use.

With these changes the driver can be used with software BCH ECC which
is useful for NAND chips that require a stronger ECC than the i.MX
hardware supports.

Signed-off-by: Sascha Hauer <s.ha...@pengutronix.de>
---
 drivers/mtd/nand/raw/mxc_nand.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/nand/raw/mxc_nand.c b/drivers/mtd/nand/raw/mxc_nand.c
index bd320bf3b8..d057d1b1bc 100644
--- a/drivers/mtd/nand/raw/mxc_nand.c
+++ b/drivers/mtd/nand/raw/mxc_nand.c
@@ -1347,15 +1347,16 @@ static int mxcnd_attach_chip(struct nand_chip *chip)
        chip->ecc.bytes = host->devtype_data->eccbytes;
        host->eccsize = host->devtype_data->eccsize;
        chip->ecc.size = 512;
-       mtd_set_ooblayout(mtd, host->devtype_data->ooblayout);
+
+       chip->ecc.read_oob = mxc_nand_read_oob;
+       chip->ecc.read_page_raw = mxc_nand_read_page_raw;
+       chip->ecc.write_page_raw = mxc_nand_write_page_raw;
 
        switch (chip->ecc.engine_type) {
        case NAND_ECC_ENGINE_TYPE_ON_HOST:
+               mtd_set_ooblayout(mtd, host->devtype_data->ooblayout);
                chip->ecc.read_page = mxc_nand_read_page;
-               chip->ecc.read_page_raw = mxc_nand_read_page_raw;
-               chip->ecc.read_oob = mxc_nand_read_oob;
                chip->ecc.write_page = mxc_nand_write_page_ecc;
-               chip->ecc.write_page_raw = mxc_nand_write_page_raw;
                chip->ecc.write_oob = mxc_nand_write_oob;
                break;
 
-- 
2.39.2


Reply via email to