Commit 13e1add1 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

mxc_nand: cleanup initialization 



The oob layout was initialized several times. Instead, use
a smallpage layout by default and switch to a largepage
afterwards if necessary.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 8c1fd89a

drivers/mtd/nand/mxc_nand.c

+22 −50
Original line number Diff line number Diff line
@@ -921,45 +921,42 @@ static int __init mxcnd_probe(struct platform_device *pdev) 
	if (err)

		goto eirq;



	/* Reset NAND */

	this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);



	/* preset operation */

	/* Unlock the internal RAM Buffer */

	writew(0x2, host->regs + NFC_CONFIG);



	/* Blocks to be unlocked */

	writew(0x0, host->regs + NFC_UNLOCKSTART_BLKADDR);

	writew(0x4000, host->regs + NFC_UNLOCKEND_BLKADDR);



	/* Unlock Block Command for given address range */

	writew(0x4, host->regs + NFC_WRPROT);



	this->ecc.size = 512;

	this->ecc.bytes = 3;

	this->ecc.layout = &nand_hw_eccoob_smallpage;



	if (pdata->hw_ecc) {

		this->ecc.calculate = mxc_nand_calculate_ecc;

		this->ecc.hwctl = mxc_nand_enable_hwecc;

		this->ecc.correct = mxc_nand_correct_data;

		this->ecc.mode = NAND_ECC_HW;

		this->ecc.size = 512;

		this->ecc.bytes = 3;

		tmp = readw(host->regs + NFC_CONFIG1);

		tmp |= NFC_ECC_EN;

		writew(tmp, host->regs + NFC_CONFIG1);

	} else {

		this->ecc.size = 512;

		this->ecc.bytes = 3;

		this->ecc.layout = &nand_hw_eccoob_smallpage;

		this->ecc.mode = NAND_ECC_SOFT;

		tmp = readw(host->regs + NFC_CONFIG1);

		tmp &= ~NFC_ECC_EN;

		writew(tmp, host->regs + NFC_CONFIG1);

	}



	/* Reset NAND */

	this->cmdfunc(mtd, NAND_CMD_RESET, -1, -1);



	/* preset operation */

	/* Unlock the internal RAM Buffer */

	writew(0x2, host->regs + NFC_CONFIG);



	/* Blocks to be unlocked */

	writew(0x0, host->regs + NFC_UNLOCKSTART_BLKADDR);

	writew(0x4000, host->regs + NFC_UNLOCKEND_BLKADDR);



	/* Unlock Block Command for given address range */

	writew(0x4, host->regs + NFC_WRPROT);



	/* NAND bus width determines access funtions used by upper layer */

	if (pdata->width == 2) {

	if (pdata->width == 2)

		this->options |= NAND_BUSWIDTH_16;

		this->ecc.layout = &nand_hw_eccoob_smallpage;

	}



	/* first scan to find the device and get the page size */

	if (nand_scan_ident(mtd, 1)) {
@@ -967,34 +964,9 @@ static int __init mxcnd_probe(struct platform_device *pdev) 
		goto escan;

	}



	host->pagesize_2k = (mtd->writesize == 2048) ? 1 : 0;



	if (this->ecc.mode == NAND_ECC_HW) {

		switch (mtd->oobsize) {

		case 8:

			this->ecc.layout = &nand_hw_eccoob_smallpage;

			break;

		case 16:

			this->ecc.layout = &nand_hw_eccoob_smallpage;

			break;

		case 64:

	if (mtd->writesize == 2048) {

		host->pagesize_2k = 1;

		this->ecc.layout = &nand_hw_eccoob_largepage;

			break;

		default:

			/* page size not handled by HW ECC */

			/* switching back to soft ECC */

			this->ecc.size = 512;

			this->ecc.bytes = 3;

			this->ecc.layout = &nand_hw_eccoob_smallpage;

			this->ecc.mode = NAND_ECC_SOFT;

			this->ecc.calculate = NULL;

			this->ecc.correct = NULL;

			this->ecc.hwctl = NULL;

			tmp = readw(host->regs + NFC_CONFIG1);

			tmp &= ~NFC_ECC_EN;

			writew(tmp, host->regs + NFC_CONFIG1);

			break;

		}

	}



	/* second phase scan */