From a5aba72e24c273ae3e9d20be11cb4e48d6501326 Mon Sep 17 00:00:00 2001 From: Prabhakar Kushwaha Date: Thu, 8 Nov 2012 13:42:59 +0530 Subject: [PATCH] --- yaml --- r: 347175 b: refs/heads/master c: d6ba745d0a073a0f48053fa4744ab2e86c310aad h: refs/heads/master i: 347173: 926be3a68be62b0e5d746938d0664d2140e1ed6b 347171: 7cb7827813a05e719a4d41b946c8a757bf951e72 347167: a4acd460a4921ecd3a9b7054afc91d0fc11d54d4 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/fsl_ifc_nand.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 994a1d9cebce..ed581b61f310 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d27aa5af04f58f3020de1c224dcf8a62151fd58 +refs/heads/master: d6ba745d0a073a0f48053fa4744ab2e86c310aad diff --git a/trunk/drivers/mtd/nand/fsl_ifc_nand.c b/trunk/drivers/mtd/nand/fsl_ifc_nand.c index 3551a99076ba..53152310804c 100644 --- a/trunk/drivers/mtd/nand/fsl_ifc_nand.c +++ b/trunk/drivers/mtd/nand/fsl_ifc_nand.c @@ -389,7 +389,7 @@ static void fsl_ifc_cmdfunc(struct mtd_info *mtd, unsigned int command, timing = IFC_FIR_OP_RBCD; out_be32(&ifc->ifc_nand.nand_fir0, - (IFC_FIR_OP_CMD0 << IFC_NAND_FIR0_OP0_SHIFT) | + (IFC_FIR_OP_CW0 << IFC_NAND_FIR0_OP0_SHIFT) | (IFC_FIR_OP_UA << IFC_NAND_FIR0_OP1_SHIFT) | (timing << IFC_NAND_FIR0_OP2_SHIFT)); out_be32(&ifc->ifc_nand.nand_fcr0, @@ -754,7 +754,7 @@ static void fsl_ifc_sram_init(struct fsl_ifc_mtd *priv) /* READID */ out_be32(&ifc->ifc_nand.nand_fir0, - (IFC_FIR_OP_CMD0 << IFC_NAND_FIR0_OP0_SHIFT) | + (IFC_FIR_OP_CW0 << IFC_NAND_FIR0_OP0_SHIFT) | (IFC_FIR_OP_UA << IFC_NAND_FIR0_OP1_SHIFT) | (IFC_FIR_OP_RB << IFC_NAND_FIR0_OP2_SHIFT)); out_be32(&ifc->ifc_nand.nand_fcr0,