NAND fsl elbc: Set FMR[ECCM] based on page size.

Hardware expects ECCM 0 for small page and ECCM 1 for large page
when booting from NAND, so use those defaults.

Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index b097ca5abad58238eef283344c54e92f0c5928e3..367c7d7fcd29f53545f3b2685bf9d8e4b9c3217c 100644 (file)
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -777,6 +777,20 @@ int board_nand_init(struct nand_chip *nand)
        nand->ecc.read_page = fsl_elbc_read_page;
        nand->ecc.write_page = fsl_elbc_write_page;
 
+#ifdef CONFIG_FSL_ELBC_FMR
+       priv->fmr = CONFIG_FSL_ELBC_FMR;
+#else
+       priv->fmr = (15 << FMR_CWTO_SHIFT) | (2 << FMR_AL_SHIFT);
+
+       /*
+        * Hardware expects small page has ECCM0, large page has ECCM1
+        * when booting from NAND.  Board config can override if not
+        * booting from NAND.
+        */
+       if (or & OR_FCM_PGS)
+               priv->fmr |= FMR_ECCM;
+#endif
+
        /* If CS Base Register selects full hardware ECC then use it */
        if ((br & BR_DECC) == BR_DECC_CHK_GEN) {
                nand->ecc.mode = NAND_ECC_HW;
@@ -793,8 +807,6 @@ int board_nand_init(struct nand_chip *nand)
                nand->ecc.mode = NAND_ECC_SOFT;
        }
 
-       priv->fmr = (15 << FMR_CWTO_SHIFT) | (2 << FMR_AL_SHIFT);
-
        /* Large-page-specific setup */
        if (or & OR_FCM_PGS) {
                priv->page_size = 1;