diff options
| author | Wu, Josh <Josh.wu@atmel.com> | 2014-06-10 11:50:10 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-07-22 05:02:09 +0200 |
| commit | 72a78e3cd2c02c46ce5a3b89a2a854199e5a4820 (patch) | |
| tree | 8ce6da298b10841ae5827ac428cb6cf2caf8e307 /drivers | |
| parent | mtd: atmel_nand: add NFC status error check (diff) | |
| download | linux-72a78e3cd2c02c46ce5a3b89a2a854199e5a4820.tar.xz linux-72a78e3cd2c02c46ce5a3b89a2a854199e5a4820.zip | |
mtd: atmel_nand: implement the nfc_device_ready() by checking the R/B bit
In nfc_device_ready(), it's more reasonable to check R/B bit in NFC_SR
than waiting for the R/B interrupt. It cost less time.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Tested-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 22e9137412b4..459acf01fefe 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1661,11 +1661,19 @@ static int nfc_send_command(struct atmel_nand_host *host, static int nfc_device_ready(struct mtd_info *mtd) { + u32 status, mask; struct nand_chip *nand_chip = mtd->priv; struct atmel_nand_host *host = nand_chip->priv; - if (!nfc_wait_interrupt(host, NFC_SR_RB_EDGE)) - return 1; - return 0; + + status = nfc_read_status(host); + mask = nfc_readl(host->nfc->hsmc_regs, IMR); + + /* The mask should be 0. If not we may lost interrupts */ + if (unlikely(mask & status)) + dev_err(host->dev, "Lost the interrupt flags: 0x%08x\n", + mask & status); + + return status & NFC_SR_RB_EDGE; } static void nfc_select_chip(struct mtd_info *mtd, int chip) |