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

Commit 1cc52399 authored by David Woodhouse's avatar David Woodhouse
Browse files

Revert "mtd: mxc_nand: fix 2KiB pagesize NAND on i.MX27" 



This reverts commit 71b7d0d9.

The problem which that commit attempted to fix was a bootloader issue,
which had been misunderstood. The 'fix' causes lots of false bad blocks
for existing users with sane firmware.

Thanks to Mathieu Berland for diagnosing the problem coherently.

Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 6f4e137e

drivers/mtd/nand/mxc_nand.c

+1 −15
Original line number Diff line number Diff line
@@ -857,17 +857,6 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, 
	}

}



/* Define some generic bad / good block scan pattern which are used

 * while scanning a device for factory marked good / bad blocks. */

static uint8_t scan_ff_pattern[] = { 0xff, 0xff };



static struct nand_bbt_descr smallpage_memorybased = {

	.options = NAND_BBT_SCAN2NDPAGE,

	.offs = 5,

	.len = 1,

	.pattern = scan_ff_pattern

};



static int __init mxcnd_probe(struct platform_device *pdev)

{

	struct nand_chip *this;
@@ -984,10 +973,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) 
		goto escan;

	}



	if (mtd->writesize == 2048) {

		host->pagesize_2k = 1;

		this->badblock_pattern = &smallpage_memorybased;

	}

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



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

		switch (mtd->oobsize) {