leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mxc nand: modify send_page to send all pages, not only one

Browse Source 
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2009-06-04 17:25:53 +02:00
parent 89121a6bfe
commit c5d23f1bf3
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/mtd/nand/mxc_nand.c
View File

@ -228,16 +228,25 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast)
wait_op_done(host, TROP_US_DELAY, islast); wait_op_done(host, TROP_US_DELAY, islast);
} }
static void send_page(struct mxc_nand_host *host, uint8_t buf_id, static void send_page(struct mxc_nand_host *host, unsigned int ops)
unsigned int ops)
{ {
/* NANDFC buffer 0 is used for page read/write */ int bufs, i;
writew(buf_id, host->regs + NFC_BUF_ADDR);
writew(ops, host->regs + NFC_CONFIG2); if (host->pagesize_2k)
bufs = 4;
else
bufs = 1;
/* Wait for operation to complete */ for (i = 0; i < bufs; i++) {
wait_op_done(host, TROP_US_DELAY, true);
/* NANDFC buffer 0 is used for page read/write */
writew(i, host->regs + NFC_BUF_ADDR);
writew(ops, host->regs + NFC_CONFIG2);
/* Wait for operation to complete */
wait_op_done(host, TROP_US_DELAY, true);
}
} }
/* Request the NANDFC to perform a read of the NAND device ID. */ /* Request the NANDFC to perform a read of the NAND device ID. */
@ -565,16 +574,10 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
send_cmd(host, command, false); send_cmd(host, command, false);
mxc_do_addr_cycle(mtd, column, page_addr); mxc_do_addr_cycle(mtd, column, page_addr);
if (host->pagesize_2k) { if (host->pagesize_2k)
/* send read confirm command */
send_cmd(host, NAND_CMD_READSTART, true); send_cmd(host, NAND_CMD_READSTART, true);
/* read for each AREA */
send_page(host, 0, NFC_OUTPUT); send_page(host, NFC_OUTPUT);
send_page(host, 1, NFC_OUTPUT);
send_page(host, 2, NFC_OUTPUT);
send_page(host, 3, NFC_OUTPUT);
} else
send_page(host, 0, NFC_OUTPUT);
memcpy(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize); memcpy(host->data_buf, host->regs + MAIN_AREA0, mtd->writesize);
copy_spare(mtd, true); copy_spare(mtd, true);
@ -614,15 +617,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
case NAND_CMD_PAGEPROG: case NAND_CMD_PAGEPROG:
memcpy(host->regs + MAIN_AREA0, host->data_buf, mtd->writesize); memcpy(host->regs + MAIN_AREA0, host->data_buf, mtd->writesize);
copy_spare(mtd, false); copy_spare(mtd, false);
send_page(host, 0, NFC_INPUT); send_page(host, NFC_INPUT);
if (host->pagesize_2k) {
/* data in 4 areas datas */
send_page(host, 1, NFC_INPUT);
send_page(host, 2, NFC_INPUT);
send_page(host, 3, NFC_INPUT);
}
send_cmd(host, command, true); send_cmd(host, command, true);
mxc_do_addr_cycle(mtd, column, page_addr); mxc_do_addr_cycle(mtd, column, page_addr);
break; break;