Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ee3d9da authored by Josh Wu's avatar Josh Wu Committed by David Woodhouse
Browse files

mtd: atmel_nand: replace pmecc enable code with one function. 



Signed-off-by: default avatarJosh Wu <josh.wu@atmel.com>
Acked-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 0d63748d

drivers/mtd/nand/atmel_nand.c

+26 −15
Original line number Diff line number Diff line
@@ -746,6 +746,30 @@ static int pmecc_correction(struct mtd_info *mtd, u32 pmecc_stat, uint8_t *buf, 
	return total_err;

}



static void pmecc_enable(struct atmel_nand_host *host, int ecc_op)

{

	u32 val;



	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST);

	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE);

	val = pmecc_readl_relaxed(host->ecc, CFG);



	if (ecc_op != NAND_ECC_READ && ecc_op != NAND_ECC_WRITE) {

		dev_err(host->dev, "atmel_nand: wrong pmecc operation type!");

		return;

	}



	if (ecc_op == NAND_ECC_READ)

		pmecc_writel(host->ecc, CFG, (val & ~PMECC_CFG_WRITE_OP)

			| PMECC_CFG_AUTO_ENABLE);

	else

		pmecc_writel(host->ecc, CFG, (val | PMECC_CFG_WRITE_OP)

			& ~PMECC_CFG_AUTO_ENABLE);



	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_ENABLE);

	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DATA);

}



static int atmel_nand_pmecc_read_page(struct mtd_info *mtd,

	struct nand_chip *chip, uint8_t *buf, int oob_required, int page)

{
@@ -757,13 +781,7 @@ static int atmel_nand_pmecc_read_page(struct mtd_info *mtd, 
	unsigned long end_time;

	int bitflips = 0;



	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST);

	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE);

	pmecc_writel(host->ecc, CFG, (pmecc_readl_relaxed(host->ecc, CFG)

		& ~PMECC_CFG_WRITE_OP) | PMECC_CFG_AUTO_ENABLE);



	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_ENABLE);

	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DATA);

	pmecc_enable(host, NAND_ECC_READ);



	chip->read_buf(mtd, buf, eccsize);

	chip->read_buf(mtd, oob, mtd->oobsize);
@@ -796,14 +814,7 @@ static int atmel_nand_pmecc_write_page(struct mtd_info *mtd, 
	int i, j;

	unsigned long end_time;



	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_RST);

	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DISABLE);



	pmecc_writel(host->ecc, CFG, (pmecc_readl_relaxed(host->ecc, CFG) |

		PMECC_CFG_WRITE_OP) & ~PMECC_CFG_AUTO_ENABLE);



	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_ENABLE);

	pmecc_writel(host->ecc, CTRL, PMECC_CTRL_DATA);

	pmecc_enable(host, NAND_ECC_WRITE);



	chip->write_buf(mtd, (u8 *)buf, mtd->writesize);