nand: raw: mxs_nand: Fix specific hook registration

Move the hook after nand_scan_tail is called. The hook must be replaced
to the mxs specific one but those must to be assignment later in the
probe function.

With this fix markbad is working again. Before this change:

nand markbad 0xDEC00
NXS NAND: Writing OOB isn't supported
NXS NAND: Writing OOB isn't supported
block 0x000dec00 NOT marked as bad! ERROR 0

Cc: Han Xu <han.xu@nxp.com>
Cc: Fabio Estevam <festevam@gmail.com>
Acked-by: Han Xu <han.xu@nxp.com>
Tested-By: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>

diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c
index 0c4e5595a7bb6880a2eaf6b6cc0600722e3a6562..7893e9d7e343a84481a3bfa83426808842505d42 100644 (file)
--- a/drivers/mtd/nand/raw/mxs_nand.c
+++ b/drivers/mtd/nand/raw/mxs_nand.c
@@ -1246,22 +1246,6 @@ int mxs_nand_setup_ecc(struct mtd_info *mtd)
        /* Enable BCH complete interrupt */
        writel(BCH_CTRL_COMPLETE_IRQ_EN, &bch_regs->hw_bch_ctrl_set);
 
-       /* Hook some operations at the MTD level. */
-       if (mtd->_read_oob != mxs_nand_hook_read_oob) {
-               nand_info->hooked_read_oob = mtd->_read_oob;
-               mtd->_read_oob = mxs_nand_hook_read_oob;
-       }
-
-       if (mtd->_write_oob != mxs_nand_hook_write_oob) {
-               nand_info->hooked_write_oob = mtd->_write_oob;
-               mtd->_write_oob = mxs_nand_hook_write_oob;
-       }
-
-       if (mtd->_block_markbad != mxs_nand_hook_block_markbad) {
-               nand_info->hooked_block_markbad = mtd->_block_markbad;
-               mtd->_block_markbad = mxs_nand_hook_block_markbad;
-       }
-
        return 0;
 }
 
@@ -1470,6 +1454,22 @@ int mxs_nand_init_ctrl(struct mxs_nand_info *nand_info)
        if (err)
                goto err_free_buffers;
 
+       /* Hook some operations at the MTD level. */
+       if (mtd->_read_oob != mxs_nand_hook_read_oob) {
+               nand_info->hooked_read_oob = mtd->_read_oob;
+               mtd->_read_oob = mxs_nand_hook_read_oob;
+       }
+
+       if (mtd->_write_oob != mxs_nand_hook_write_oob) {
+               nand_info->hooked_write_oob = mtd->_write_oob;
+               mtd->_write_oob = mxs_nand_hook_write_oob;
+       }
+
+       if (mtd->_block_markbad != mxs_nand_hook_block_markbad) {
+               nand_info->hooked_block_markbad = mtd->_block_markbad;
+               mtd->_block_markbad = mxs_nand_hook_block_markbad;
+       }
+
        err = nand_register(0, mtd);
        if (err)
                goto err_free_buffers;