Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / drivers / mtd / nand / fsl_upm.c

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 73abbbad1f0370ba879ddf0b1db743f5c3afb915..7cb99cbc074b7bb3c020b20e32dd86a8d32ae513 100644 (file)
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -48,6 +48,20 @@ static void fsl_upm_run_pattern(struct fsl_upm *upm, int width,
        }
 }
 
+static void fun_wait(struct fsl_upm_nand *fun)
+{
+       if (fun->dev_ready) {
+               while (!fun->dev_ready(fun->chip_nr))
+                       debug("unexpected busy state\n");
+       } else {
+               /*
+                * If the R/B pin is not connected, like on the TQM8548,
+                * a short delay is necessary.
+                */
+               udelay(1);
+       }
+}
+
 #if CONFIG_SYS_NAND_MAX_CHIPS > 1
 static void fun_select_chip(struct mtd_info *mtd, int chip_nr)
 {
@@ -90,21 +104,22 @@ static void fun_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
        mar = cmd << (32 - fun->width);
        io_addr = fun->upm.io_addr;
 #if CONFIG_SYS_NAND_MAX_CHIPS > 1
-       if (fun->chip_nr > 0)
+       if (fun->chip_nr > 0) {
                io_addr += fun->chip_offset * fun->chip_nr;
+               if (fun->upm_mar_chip_offset)
+                       mar |= fun->upm_mar_chip_offset * fun->chip_nr;
+       }
 #endif
        fsl_upm_run_pattern(&fun->upm, fun->width, io_addr, mar);
 
        /*
-        * Some boards/chips needs this. At least on MPC8360E-RDK we
-        * need it. Probably weird chip, because I don't see any need
-        * for this on MPC8555E + Samsung K9F1G08U0A. Usually here are
-        * 0-2 unexpected busy states per block read.
+        * Some boards/chips needs this. At least the MPC8360E-RDK and
+        * TQM8548 need it. Probably weird chip, because I don't see
+        * any need for this on MPC8555E + Samsung K9F1G08U0A. Usually
+        * here are 0-2 unexpected busy states per block read.
         */
-       if (fun->wait_pattern) {
-               while (!fun->dev_ready(fun->chip_nr))
-                       debug("unexpected busy state\n");
-       }
+       if (fun->wait_flags & FSL_UPM_WAIT_RUN_PATTERN)
+               fun_wait(fun);
 }
 
 static u8 nand_read_byte(struct mtd_info *mtd)
@@ -118,9 +133,16 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
        int i;
        struct nand_chip *chip = mtd->priv;
+       struct fsl_upm_nand *fun = chip->priv;
 
-       for (i = 0; i < len; i++)
+       for (i = 0; i < len; i++) {
                out_8(chip->IO_ADDR_W, buf[i]);
+               if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BYTE)
+                       fun_wait(fun);
+       }
+
+       if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BUFFER)
+               fun_wait(fun);
 }
 
 static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)