Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 207810
b: refs/heads/master
c: 5f97304
h: refs/heads/master
v: v3
  • Loading branch information
Sascha Hauer authored and David Woodhouse committed Aug 6, 2010
1 parent 2b1a4d9 commit 2c7eb04
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c29c607afa2e94a43f249f19a2d3097e56aaedd7
refs/heads/master: 5f97304ef12b79f1a466971eefdf93ea3b2d341f
72 changes: 44 additions & 28 deletions trunk/drivers/mtd/nand/mxc_nand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,13 @@ struct mxc_nand_host {
uint8_t *data_buf;
unsigned int buf_start;
int spare_len;

void (*preset)(struct mtd_info *);
void (*send_cmd)(struct mxc_nand_host *, uint16_t, int);
void (*send_addr)(struct mxc_nand_host *, uint16_t, int);
void (*send_page)(struct mtd_info *, unsigned int);
void (*send_read_id)(struct mxc_nand_host *);
uint16_t (*get_dev_status)(struct mxc_nand_host *);
};

/* OOB placement block for use with hardware ecc generation */
Expand Down Expand Up @@ -212,7 +219,7 @@ static void wait_op_done(struct mxc_nand_host *host, int useirq)

/* This function issues the specified command to the NAND device and
* waits for completion. */
static void send_cmd(struct mxc_nand_host *host, uint16_t cmd, int useirq)
static void send_cmd_v1_v2(struct mxc_nand_host *host, uint16_t cmd, int useirq)
{
DEBUG(MTD_DEBUG_LEVEL3, "send_cmd(host, 0x%x, %d)\n", cmd, useirq);

Expand Down Expand Up @@ -241,7 +248,7 @@ static void send_cmd(struct mxc_nand_host *host, uint16_t cmd, int useirq)
/* This function sends an address (or partial address) to the
* NAND device. The address is used to select the source/destination for
* a NAND command. */
static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast)
static void send_addr_v1_v2(struct mxc_nand_host *host, uint16_t addr, int islast)
{
DEBUG(MTD_DEBUG_LEVEL3, "send_addr(host, 0x%x %d)\n", addr, islast);

Expand All @@ -252,7 +259,7 @@ static void send_addr(struct mxc_nand_host *host, uint16_t addr, int islast)
wait_op_done(host, islast);
}

static void send_page(struct mtd_info *mtd, unsigned int ops)
static void send_page_v1_v2(struct mtd_info *mtd, unsigned int ops)
{
struct nand_chip *nand_chip = mtd->priv;
struct mxc_nand_host *host = nand_chip->priv;
Expand All @@ -276,7 +283,7 @@ static void send_page(struct mtd_info *mtd, unsigned int ops)
}

/* Request the NANDFC to perform a read of the NAND device ID. */
static void send_read_id(struct mxc_nand_host *host)
static void send_read_id_v1_v2(struct mxc_nand_host *host)
{
struct nand_chip *this = &host->nand;

Expand All @@ -302,7 +309,7 @@ static void send_read_id(struct mxc_nand_host *host)

/* This function requests the NANDFC to perform a read of the
* NAND device status and returns the current status. */
static uint16_t get_dev_status(struct mxc_nand_host *host)
static uint16_t get_dev_status_v1_v2(struct mxc_nand_host *host)
{
void __iomem *main_buf = host->main_area0;
uint32_t store;
Expand Down Expand Up @@ -381,7 +388,7 @@ static u_char mxc_nand_read_byte(struct mtd_info *mtd)

/* Check for status request */
if (host->status_request)
return get_dev_status(host) & 0xFF;
return host->get_dev_status(host) & 0xFF;

ret = *(uint8_t *)(host->data_buf + host->buf_start);
host->buf_start++;
Expand Down Expand Up @@ -517,39 +524,39 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr)
* we will used the saved column address to index into
* the full page.
*/
send_addr(host, 0, page_addr == -1);
host->send_addr(host, 0, page_addr == -1);
if (mtd->writesize > 512)
/* another col addr cycle for 2k page */
send_addr(host, 0, false);
host->send_addr(host, 0, false);
}

/* Write out page address, if necessary */
if (page_addr != -1) {
/* paddr_0 - p_addr_7 */
send_addr(host, (page_addr & 0xff), false);
host->send_addr(host, (page_addr & 0xff), false);

if (mtd->writesize > 512) {
if (mtd->size >= 0x10000000) {
/* paddr_8 - paddr_15 */
send_addr(host, (page_addr >> 8) & 0xff, false);
send_addr(host, (page_addr >> 16) & 0xff, true);
host->send_addr(host, (page_addr >> 8) & 0xff, false);
host->send_addr(host, (page_addr >> 16) & 0xff, true);
} else
/* paddr_8 - paddr_15 */
send_addr(host, (page_addr >> 8) & 0xff, true);
host->send_addr(host, (page_addr >> 8) & 0xff, true);
} else {
/* One more address cycle for higher density devices */
if (mtd->size >= 0x4000000) {
/* paddr_8 - paddr_15 */
send_addr(host, (page_addr >> 8) & 0xff, false);
send_addr(host, (page_addr >> 16) & 0xff, true);
host->send_addr(host, (page_addr >> 8) & 0xff, false);
host->send_addr(host, (page_addr >> 16) & 0xff, true);
} else
/* paddr_8 - paddr_15 */
send_addr(host, (page_addr >> 8) & 0xff, true);
host->send_addr(host, (page_addr >> 8) & 0xff, true);
}
}
}

static void preset(struct mtd_info *mtd)
static void preset_v1_v2(struct mtd_info *mtd)
{
struct nand_chip *nand_chip = mtd->priv;
struct mxc_nand_host *host = nand_chip->priv;
Expand Down Expand Up @@ -602,15 +609,15 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
/* Command pre-processing step */
switch (command) {
case NAND_CMD_RESET:
preset(mtd);
send_cmd(host, command, false);
host->preset(mtd);
host->send_cmd(host, command, false);
break;

case NAND_CMD_STATUS:
host->buf_start = 0;
host->status_request = true;

send_cmd(host, command, true);
host->send_cmd(host, command, true);
mxc_do_addr_cycle(mtd, column, page_addr);
break;

Expand All @@ -623,13 +630,13 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,

command = NAND_CMD_READ0; /* only READ0 is valid */

send_cmd(host, command, false);
host->send_cmd(host, command, false);
mxc_do_addr_cycle(mtd, column, page_addr);

if (mtd->writesize > 512)
send_cmd(host, NAND_CMD_READSTART, true);
host->send_cmd(host, NAND_CMD_READSTART, true);

send_page(mtd, NFC_OUTPUT);
host->send_page(mtd, NFC_OUTPUT);

memcpy(host->data_buf, host->main_area0, mtd->writesize);
copy_spare(mtd, true);
Expand All @@ -642,28 +649,28 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,

host->buf_start = column;

send_cmd(host, command, false);
host->send_cmd(host, command, false);
mxc_do_addr_cycle(mtd, column, page_addr);
break;

case NAND_CMD_PAGEPROG:
memcpy(host->main_area0, host->data_buf, mtd->writesize);
copy_spare(mtd, false);
send_page(mtd, NFC_INPUT);
send_cmd(host, command, true);
host->send_page(mtd, NFC_INPUT);
host->send_cmd(host, command, true);
mxc_do_addr_cycle(mtd, column, page_addr);
break;

case NAND_CMD_READID:
send_cmd(host, command, true);
host->send_cmd(host, command, true);
mxc_do_addr_cycle(mtd, column, page_addr);
send_read_id(host);
host->send_read_id(host);
host->buf_start = column;
break;

case NAND_CMD_ERASE1:
case NAND_CMD_ERASE2:
send_cmd(host, command, false);
host->send_cmd(host, command, false);
mxc_do_addr_cycle(mtd, column, page_addr);

break;
Expand Down Expand Up @@ -760,6 +767,15 @@ static int __init mxcnd_probe(struct platform_device *pdev)

host->main_area0 = host->base;

if (nfc_is_v1() || nfc_is_v21()) {
host->preset = preset_v1_v2;
host->send_cmd = send_cmd_v1_v2;
host->send_addr = send_addr_v1_v2;
host->send_page = send_page_v1_v2;
host->send_read_id = send_read_id_v1_v2;
host->get_dev_status = get_dev_status_v1_v2;
}

if (nfc_is_v21()) {
host->regs = host->base + 0x1e00;
host->spare0 = host->base + 0x1000;
Expand Down

0 comments on commit 2c7eb04

Please sign in to comment.