mtd: atmel_nand: check NFC busy flag by HSMC_SR instead of NFC cmd regs

Currently the driver read NFC command registers to get NFC busy flag.
Actually this flag also can be get by reading HSMC_SR register.

Use the read NFC command registers need mapping a huge memory region.
To save the mapped memory region, we change to check NFC busy flag by
reading HSMC_SR register.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 13104507da63826fb8aa9631d6e1f28e23b4304a..feaac9099bb971e48dd120daabf4f8c641f7c9f5 100644 (file)
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -1752,11 +1752,10 @@ static int nfc_send_command(struct atmel_nand_host *host,
                cmd, addr, cycle0);
 
        timeout = jiffies + msecs_to_jiffies(NFC_TIME_OUT_MS);
-       while (nfc_cmd_readl(NFCADDR_CMD_NFCBUSY, host->nfc->base_cmd_regs)
-                       & NFCADDR_CMD_NFCBUSY) {
+       while (nfc_readl(host->nfc->hsmc_regs, SR) & NFC_SR_BUSY) {
                if (time_after(jiffies, timeout)) {
                        dev_err(host->dev,
-                               "Time out to wait CMD_NFCBUSY ready!\n");
+                               "Time out to wait for NFC ready!\n");
                        return -ETIMEDOUT;
                }
        }

diff --git a/drivers/mtd/nand/atmel_nand_nfc.h b/drivers/mtd/nand/atmel_nand_nfc.h
index 85b8ca6af7d2d5d9e1e804cb4b575733e0fc38a5..4d5d26221a7ee512d3d16e02441f0619d81ad900 100644 (file)
--- a/drivers/mtd/nand/atmel_nand_nfc.h
+++ b/drivers/mtd/nand/atmel_nand_nfc.h
@@ -35,6 +35,7 @@
 #define                NFC_CTRL_DISABLE        (1 << 1)
 
 #define ATMEL_HSMC_NFC_SR      0x08            /* NFC Status Register */
+#define                NFC_SR_BUSY             (1 << 8)
 #define                NFC_SR_XFR_DONE         (1 << 16)
 #define                NFC_SR_CMD_DONE         (1 << 17)
 #define                NFC_SR_DTOE             (1 << 20)