diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-10 10:56:56 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-11-12 08:08:01 +0100 |
| commit | bb81ff75d484994a710abfc18cae37d62d3b1087 (patch) | |
| tree | 0178f1416d108da86cbb69718a5ed4963f1e7a84 | |
| parent | dd62a0c2d15350a3633d502e1e6613c4a28268f8 (diff) | |
| download | barebox-bb81ff75d484994a710abfc18cae37d62d3b1087.tar.gz barebox-bb81ff75d484994a710abfc18cae37d62d3b1087.tar.xz | |
imx_nand: rework get_dev_status
We save/restore the value in the buffer anyway, so it makes
no difference whether we use main_area0 or main_area1. So,
we can use main_area0 and remove main_area1 from the driver
which is otherwise unused. Also, clean up the comments in
get_dev_status.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/mtd/nand/nand_imx.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/mtd/nand/nand_imx.c b/drivers/mtd/nand/nand_imx.c index d5503a1c48..b49b7db240 100644 --- a/drivers/mtd/nand/nand_imx.c +++ b/drivers/mtd/nand/nand_imx.c @@ -142,7 +142,6 @@ struct imx_nand_host { void *spare0; void *main_area0; - void *main_area1; void __iomem *base; void __iomem *regs; @@ -361,18 +360,18 @@ static void send_read_id(struct imx_nand_host *host) */ static u16 get_dev_status(struct imx_nand_host *host) { - volatile u16 *mainbuf = host->main_area1; + void *main_buf = host->main_area0; u32 store; u16 ret, tmp; - /* Issue status request to NAND device */ - /* store the main area1 first word, later do recovery */ - store = *((u32 *) mainbuf); + writew(0x0, host->regs + NFC_BUF_ADDR); + /* - * NANDFC buffer 1 is used for device status to prevent - * corruption of read/write buffer on status requests. + * The device status is stored in main_area0. To + * prevent corruption of the buffer save the value + * and restore it afterwards. */ - writew(1, host->regs + NFC_BUF_ADDR); + store = readl(main_buf); /* Read status into main buffer */ tmp = readw(host->regs + NFC_CONFIG1); @@ -386,8 +385,9 @@ static u16 get_dev_status(struct imx_nand_host *host) /* Status is placed in first word of main buffer */ /* get status, then recovery area 1 data */ - ret = mainbuf[0]; - *((u32 *) mainbuf) = store; + ret = readw(main_buf); + + writel(store, main_buf); return ret; } @@ -858,7 +858,6 @@ static int __init imxnd_probe(struct device_d *dev) host->base = (void __iomem *)dev->map_base; host->main_area0 = host->base; - host->main_area1 = host->base + 0x200; if (nfc_is_v21()) { host->regs = host->base + 0x1e00; |