From 8b05f7528cd9bccb0dffe7fa3606c7280a21f82d Mon Sep 17 00:00:00 2001 From: Eric Benard Date: Thu, 22 Oct 2009 16:45:00 +0200 Subject: [PATCH] imx-nand : remove wrong part of commit ca326e88827e08e723046a21b18e74d41d15ace7 previous fix for 2k pages was wrong so remove it Signed-off-by: Eric Benard Signed-off-by: Sascha Hauer --- board/eukrea_cpuimx27/eukrea_cpuimx27.c | 1 - drivers/nand/nand_imx.c | 15 +-------------- include/asm-arm/arch-imx/imx-nand.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/board/eukrea_cpuimx27/eukrea_cpuimx27.c b/board/eukrea_cpuimx27/eukrea_cpuimx27.c index 5d66a712..038a3fca 100644 --- a/board/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/board/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -73,7 +73,6 @@ static struct device_d fec_dev = { struct imx_nand_platform_data nand_info = { .width = 1, .hw_ecc = 1, - .is2k = 1, }; static struct device_d nand_dev = { diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c index bda8ecf4..ee8f0f42 100644 --- a/drivers/nand/nand_imx.c +++ b/drivers/nand/nand_imx.c @@ -969,14 +969,6 @@ static void imx_low_erase(struct mtd_info *mtd) * * @return The function always returns 0. */ -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 imxnd_probe(struct device_d *dev) { @@ -1067,12 +1059,7 @@ static int __init imxnd_probe(struct device_d *dev) this->ecc.layout = &nand_hw_eccoob_16; } - if (pdata->is2k) { - host->pagesize_2k = 1; - NFMS |= (1 << NFMS_BIT); - this->badblock_pattern = &smallpage_memorybased; - } else - host->pagesize_2k = 0; + host->pagesize_2k = 0; this->options |= NAND_SKIP_BBTSCAN; diff --git a/include/asm-arm/arch-imx/imx-nand.h b/include/asm-arm/arch-imx/imx-nand.h index 500bb1a9..026c0729 100644 --- a/include/asm-arm/arch-imx/imx-nand.h +++ b/include/asm-arm/arch-imx/imx-nand.h @@ -8,7 +8,6 @@ void imx_nand_load_image(void *dest, int size, int pagesize, int blocksize); struct imx_nand_platform_data { int width; int hw_ecc; - int is2k; }; #endif /* __ASM_ARCH_NAND_H */ -- 2.11.4.GIT