diff options
| author | Eric Benard <eric@eukrea.com> | 2009-07-15 17:18:40 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-07-16 09:46:34 +0200 |
| commit | ca326e88827e08e723046a21b18e74d41d15ace7 (patch) | |
| tree | 553b3de163f7f0980e489fee68a444becb9c254a /drivers | |
| parent | b2db2e6cd838162c58f078d4202c795a3f86f362 (diff) | |
| download | barebox-ca326e88827e08e723046a21b18e74d41d15ace7.tar.gz barebox-ca326e88827e08e723046a21b18e74d41d15ace7.tar.xz | |
Fix 2k page size NAND for iMX27
Signed-off-by: Eric Benard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nand/nand_imx.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c index cbff7ceef4..ecfb6494e6 100644 --- a/drivers/nand/nand_imx.c +++ b/drivers/nand/nand_imx.c @@ -874,7 +874,7 @@ static void imx_nand_command(struct mtd_info *mtd, unsigned command, if (host->pagesize_2k) { send_addr(host, (page_addr >> 8) & 0xFF); - if (mtd->size >= 0x40000000) { + if (mtd->size >= 0x10000000) { send_addr(host, (page_addr >> 16) & 0xff); } } else { @@ -961,6 +961,15 @@ 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) { struct nand_chip *this; @@ -969,7 +978,7 @@ static int __init imxnd_probe(struct device_d *dev) struct imx_nand_host *host; u16 tmp; int err = 0; -#ifdef CONFIG_ARCH_MX27 +#ifdef CONFIG_ARCH_IMX27 PCCR1 |= PCCR1_NFC_BAUDEN; #endif /* Allocate memory for MTD device structure and private data */ @@ -1050,7 +1059,12 @@ static int __init imxnd_probe(struct device_d *dev) this->ecc.layout = &nand_hw_eccoob_16; } - host->pagesize_2k = 0; + if (pdata->is2k) { + host->pagesize_2k = 1; + NFMS |= (1 << NFMS_BIT); + this->badblock_pattern = &smallpage_memorybased; + } else + host->pagesize_2k = 0; /* Scan to find existence of the device */ if (nand_scan(mtd, 1)) { |