mxc_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> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>hifive-unleashed-5.1
parent
938cf997f9
commit
c29c607afa
|
@ -102,7 +102,6 @@ struct mxc_nand_host {
|
||||||
|
|
||||||
void *spare0;
|
void *spare0;
|
||||||
void *main_area0;
|
void *main_area0;
|
||||||
void *main_area1;
|
|
||||||
|
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
void __iomem *regs;
|
void __iomem *regs;
|
||||||
|
@ -305,25 +304,24 @@ static void send_read_id(struct mxc_nand_host *host)
|
||||||
* NAND device status and returns the current status. */
|
* 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(struct mxc_nand_host *host)
|
||||||
{
|
{
|
||||||
void __iomem *main_buf = host->main_area1;
|
void __iomem *main_buf = host->main_area0;
|
||||||
uint32_t store;
|
uint32_t store;
|
||||||
uint16_t ret;
|
uint16_t ret;
|
||||||
/* Issue status request to NAND device */
|
|
||||||
|
|
||||||
/* store the main area1 first word, later do recovery */
|
writew(0x0, NFC_V1_V2_BUF_ADDR);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The device status is stored in main_area0. To
|
||||||
|
* prevent corruption of the buffer save the value
|
||||||
|
* and restore it afterwards.
|
||||||
|
*/
|
||||||
store = readl(main_buf);
|
store = readl(main_buf);
|
||||||
/* NANDFC buffer 1 is used for device status to prevent
|
|
||||||
* corruption of read/write buffer on status requests. */
|
|
||||||
writew(1, host->regs + NFC_BUF_ADDR);
|
|
||||||
|
|
||||||
writew(NFC_STATUS, host->regs + NFC_CONFIG2);
|
writew(NFC_STATUS, host->regs + NFC_CONFIG2);
|
||||||
|
|
||||||
/* Wait for operation to complete */
|
|
||||||
wait_op_done(host, true);
|
wait_op_done(host, true);
|
||||||
|
|
||||||
/* Status is placed in first word of main buffer */
|
|
||||||
/* get status, then recovery area 1 data */
|
|
||||||
ret = readw(main_buf);
|
ret = readw(main_buf);
|
||||||
|
|
||||||
writel(store, main_buf);
|
writel(store, main_buf);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -761,7 +759,6 @@ static int __init mxcnd_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
host->main_area0 = host->base;
|
host->main_area0 = host->base;
|
||||||
host->main_area1 = host->base + 0x200;
|
|
||||||
|
|
||||||
if (nfc_is_v21()) {
|
if (nfc_is_v21()) {
|
||||||
host->regs = host->base + 0x1e00;
|
host->regs = host->base + 0x1e00;
|
||||||
|
|
Loading…
Reference in New Issue