diff options
| author | Eric Bénard <eric@eukrea.com> | 2013-12-11 19:24:27 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-19 16:58:25 +0100 |
| commit | 7ef217bbb66987c44d7cd8626f7cede73f5d54ce (patch) | |
| tree | 54b4774a5121256586dd670ba3fa54787cbdff10 /drivers/mtd/nand/nand_imx.c | |
| parent | 038fe953e6e396601d64c89022062e26358d26f0 (diff) | |
| download | barebox-7ef217bbb66987c44d7cd8626f7cede73f5d54ce.tar.gz barebox-7ef217bbb66987c44d7cd8626f7cede73f5d54ce.tar.xz | |
nand_imx: fix read ONFI param on NFC v21
tested on an i.MX25 where we now get :
nand: ONFI param page 0 valid
nand: ONFI flash detected
nand: NAND device: Manufacturer ID: 0x2c, Chip ID: 0xda (Micron MT29F2G08ABAEAWP), 256MiB, page size: 2048, OOB size: 64
Signed-off-by: Eric Bénard <eric@eukrea.com>
Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/nand/nand_imx.c')
| -rw-r--r-- | drivers/mtd/nand/nand_imx.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index 965b41e866..5cfe98d2e2 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -403,12 +403,14 @@ static void send_read_id_v1_v2(struct imx_nand_host *host) memcpy32(host->data_buf, host->main_area0, 16); } -/* FIXME : to check on real HW */ static void send_read_param_v1_v2(struct imx_nand_host *host) { - struct nand_chip *this = &host->nand; + u32 backup = readw(host->regs + NFC_V1_V2_CONFIG1); - /* NANDFC buffer 0 is used for device ID output */ + /* Temporary disable ECC to be able to read param page */ + writew(backup & ~NFC_V1_V2_CONFIG1_ECC_EN, host->regs + NFC_V1_V2_CONFIG1); + + /* NANDFC buffer 0 is used for param output */ writew(0x0, host->regs + NFC_V1_V2_BUF_ADDR); writew(NFC_OUTPUT, host->regs + NFC_V1_V2_CONFIG2); @@ -416,20 +418,10 @@ static void send_read_param_v1_v2(struct imx_nand_host *host) /* Wait for operation to complete */ wait_op_done(host); - if (this->options & NAND_BUSWIDTH_16) { - volatile u16 *mainbuf = host->main_area0; - - /* - * Pack the every-other-byte result for 16-bit ID reads - * into every-byte as the generic code expects and various - * chips implement. - */ - - mainbuf[0] = (mainbuf[0] & 0xff) | ((mainbuf[1] & 0xff) << 8); - mainbuf[1] = (mainbuf[2] & 0xff) | ((mainbuf[3] & 0xff) << 8); - mainbuf[2] = (mainbuf[4] & 0xff) | ((mainbuf[5] & 0xff) << 8); - } memcpy32(host->data_buf, host->main_area0, 1024); + + /* Restore original CONFIG1 value */ + writew(backup, host->regs + NFC_V1_V2_CONFIG1); } /* * This function requests the NANDFC to perform a read of the @@ -1147,7 +1139,7 @@ static int __init imxnd_probe(struct device_d *dev) host->send_addr = send_addr_v1_v2; host->send_page = send_page_v1_v2; host->send_read_id = send_read_id_v1_v2; - host->send_read_param = send_read_param_v1_v2; /* FIXME : to check */ + host->send_read_param = send_read_param_v1_v2; host->get_dev_status = get_dev_status_v1_v2; host->check_int = check_int_v1_v2; } |