Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / mtd / nand / sunxi_nand.c

diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index ba78e13a3570442c68298b8bb2bd61e3112d50ca..0eeeb8b889ea8af83a12126ded319e84f0389618 100644 (file)
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -522,6 +522,8 @@ static void sunxi_nfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
        u32 tmp;
 
        while (len > offs) {
+               bool poll = false;
+
                cnt = min(len - offs, NFC_SRAM_SIZE);
 
                ret = sunxi_nfc_wait_cmd_fifo_empty(nfc);
@@ -532,7 +534,11 @@ static void sunxi_nfc_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
                tmp = NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD;
                writel(tmp, nfc->regs + NFC_REG_CMD);
 
-               ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);
+               /* Arbitrary limit for polling mode */
+               if (cnt < 64)
+                       poll = true;
+
+               ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, poll, 0);
                if (ret)
                        break;
 
@@ -555,6 +561,8 @@ static void sunxi_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf,
        u32 tmp;
 
        while (len > offs) {
+               bool poll = false;
+
                cnt = min(len - offs, NFC_SRAM_SIZE);
 
                ret = sunxi_nfc_wait_cmd_fifo_empty(nfc);
@@ -567,7 +575,11 @@ static void sunxi_nfc_write_buf(struct mtd_info *mtd, const uint8_t *buf,
                      NFC_ACCESS_DIR;
                writel(tmp, nfc->regs + NFC_REG_CMD);
 
-               ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);
+               /* Arbitrary limit for polling mode */
+               if (cnt < 64)
+                       poll = true;
+
+               ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, poll, 0);
                if (ret)
                        break;
 
@@ -592,10 +604,6 @@ static void sunxi_nfc_cmd_ctrl(struct mtd_info *mtd, int dat,
        struct sunxi_nfc *nfc = to_sunxi_nfc(sunxi_nand->nand.controller);
        int ret;
 
-       ret = sunxi_nfc_wait_cmd_fifo_empty(nfc);
-       if (ret)
-               return;
-
        if (dat == NAND_CMD_NONE && (ctrl & NAND_NCE) &&
            !(ctrl & (NAND_CLE | NAND_ALE))) {
                u32 cmd = 0;
@@ -625,6 +633,10 @@ static void sunxi_nfc_cmd_ctrl(struct mtd_info *mtd, int dat,
                        writel(sunxi_nand->addr[1],
                               nfc->regs + NFC_REG_ADDR_HIGH);
 
+               ret = sunxi_nfc_wait_cmd_fifo_empty(nfc);
+               if (ret)
+                       return;
+
                writel(cmd, nfc->regs + NFC_REG_CMD);
                sunxi_nand->addr[0] = 0;
                sunxi_nand->addr[1] = 0;
@@ -961,7 +973,7 @@ static int sunxi_nfc_hw_ecc_read_chunk(struct mtd_info *mtd,
        writel(NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD | NFC_ECC_OP,
               nfc->regs + NFC_REG_CMD);
 
-       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);
+       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);
        sunxi_nfc_randomizer_disable(mtd);
        if (ret)
                return ret;
@@ -1073,7 +1085,7 @@ static int sunxi_nfc_hw_ecc_read_chunks_dma(struct mtd_info *mtd, uint8_t *buf,
        writel(NFC_PAGE_OP | NFC_DATA_SWAP_METHOD | NFC_DATA_TRANS,
               nfc->regs + NFC_REG_CMD);
 
-       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);
+       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);
        if (ret)
                dmaengine_terminate_all(nfc->dmac);
 
@@ -1193,7 +1205,7 @@ static int sunxi_nfc_hw_ecc_write_chunk(struct mtd_info *mtd,
               NFC_ACCESS_DIR | NFC_ECC_OP,
               nfc->regs + NFC_REG_CMD);
 
-       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);
+       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);
        sunxi_nfc_randomizer_disable(mtd);
        if (ret)
                return ret;
@@ -1432,7 +1444,7 @@ static int sunxi_nfc_hw_ecc_write_page_dma(struct mtd_info *mtd,
               NFC_DATA_TRANS | NFC_ACCESS_DIR,
               nfc->regs + NFC_REG_CMD);
 
-       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, true, 0);
+       ret = sunxi_nfc_wait_events(nfc, NFC_CMD_INT_FLAG, false, 0);
        if (ret)
                dmaengine_terminate_all(nfc->dmac);