MTD: mxs_nand: Fix BCH read timeout error on boards requiring ECC

The LogicPD board uses a Micron Flash with ECC.  To boot this from
SPL, the ECC needs to be correctly configured or the BCH engine
times out.

Signed-off-by: Adam Ford <[email protected]>
Acked-by: Stefan Agner <[email protected]>
Tested-by: Jörg Krause <[email protected]>
Acked-by: Tim Harvey <[email protected]>
Tested-by: Tim Harvey <[email protected]>

diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index e3341812a203a3984fdbdbebea6207eab20c0709..2d84bfffe2ed462740b30d9c5d886399206fb0f6 100644 (file)
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -1163,6 +1163,12 @@ int mxs_nand_init_spl(struct nand_chip *nand)
 
        nand_info->gpmi_regs = (struct mxs_gpmi_regs *)MXS_GPMI_BASE;
        nand_info->bch_regs = (struct mxs_bch_regs *)MXS_BCH_BASE;
+
+       if (is_mx6sx() || is_mx7())
+               nand_info->max_ecc_strength_supported = 62;
+       else
+               nand_info->max_ecc_strength_supported = 40;
+
        err = mxs_nand_alloc_buffers(nand_info);
        if (err)
                return err;

diff --git a/drivers/mtd/nand/raw/mxs_nand_spl.c b/drivers/mtd/nand/raw/mxs_nand_spl.c
index c628f3adec0fbe7cd620d74685fe361ddd253317..ba85baac6030af575662629dc6343704a494444f 100644 (file)
--- a/drivers/mtd/nand/raw/mxs_nand_spl.c
+++ b/drivers/mtd/nand/raw/mxs_nand_spl.c
@@ -201,6 +201,7 @@ static int mxs_nand_init(void)
        /* setup flash layout (does not scan as we override that) */
        mtd->size = nand_chip.chipsize;
        nand_chip.scan_bbt(mtd);
+       mxs_nand_setup_ecc(mtd);
 
        return 0;
 }