mtd: nand: Add ONFI support for FSL NAND controller

- fix NAND_CMD_READID command for ONFI detect.
- add NAND_CMD_PARAM command to read the ONFI parameter page.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 080e6037cbfb..7195ee6efe12 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -356,20 +356,22 @@ static void fsl_elbc_cmdfunc(struct mtd_info *mtd, unsigned int command,
                 fsl_elbc_run_command(mtd);
                 return;
 
-        /* READID must read all 5 possible bytes while CEB is active */
         case NAND_CMD_READID:
-                dev_vdbg(priv->dev, "fsl_elbc_cmdfunc: NAND_CMD_READID.\n");
+        case NAND_CMD_PARAM:
+                dev_vdbg(priv->dev, "fsl_elbc_cmdfunc: NAND_CMD %x\n", command);
 
                 out_be32(&lbc->fir, (FIR_OP_CM0 << FIR_OP0_SHIFT) |
                                     (FIR_OP_UA  << FIR_OP1_SHIFT) |
                                     (FIR_OP_RBW << FIR_OP2_SHIFT));
-                out_be32(&lbc->fcr, NAND_CMD_READID << FCR_CMD0_SHIFT);
-                /* nand_get_flash_type() reads 8 bytes of entire ID string */
-                out_be32(&lbc->fbcr, 8);
-                elbc_fcm_ctrl->read_bytes = 8;
+                out_be32(&lbc->fcr, command << FCR_CMD0_SHIFT);
+                /*
+                 * although currently it's 8 bytes for READID, we always read
+                 * the maximum 256 bytes(for PARAM)
+                 */
+                out_be32(&lbc->fbcr, 256);
+                elbc_fcm_ctrl->read_bytes = 256;
                 elbc_fcm_ctrl->use_mdr = 1;
-                elbc_fcm_ctrl->mdr = 0;
-
+                elbc_fcm_ctrl->mdr = column;
                 set_addr(mtd, 0, 0, 0);
                 fsl_elbc_run_command(mtd);
                 return;