1 files changed, 94 insertions, 25 deletions

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 7815a404a632..d120cd8d7267 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -23,6 +23,10 @@
 #include <linux/io.h>
 #include <asm/fsl_lbc.h>
 
+#define FSL_UPM_WAIT_RUN_PATTERN  0x1
+#define FSL_UPM_WAIT_WRITE_BYTE   0x2
+#define FSL_UPM_WAIT_WRITE_BUFFER 0x4
+
 struct fsl_upm_nand {
         struct device *dev;
         struct mtd_info mtd;
@@ -36,8 +40,12 @@ struct fsl_upm_nand {
         uint8_t upm_addr_offset;
         uint8_t upm_cmd_offset;
         void __iomem *io_base;
-        int rnb_gpio;
+        int rnb_gpio[NAND_MAX_CHIPS];
+        uint32_t mchip_offsets[NAND_MAX_CHIPS];
+        uint32_t mchip_count;
+        uint32_t mchip_number;
         int chip_delay;
+        uint32_t wait_flags;
 };
 
 #define to_fsl_upm_nand(mtd) container_of(mtd, struct fsl_upm_nand, mtd)
@@ -46,7 +54,7 @@ static int fun_chip_ready(struct mtd_info *mtd)
 {
         struct fsl_upm_nand *fun = to_fsl_upm_nand(mtd);
 
-        if (gpio_get_value(fun->rnb_gpio))
+        if (gpio_get_value(fun->rnb_gpio[fun->mchip_number]))
                 return 1;
 
         dev_vdbg(fun->dev, "busy\n");
@@ -55,9 +63,9 @@ static int fun_chip_ready(struct mtd_info *mtd)
 
 static void fun_wait_rnb(struct fsl_upm_nand *fun)
 {
-        int cnt = 1000000;
+        if (fun->rnb_gpio[fun->mchip_number] >= 0) {
+                int cnt = 1000000;
 
-        if (fun->rnb_gpio >= 0) {
                 while (--cnt && !fun_chip_ready(&fun->mtd))
                         cpu_relax();
                 if (!cnt)
@@ -69,7 +77,9 @@ static void fun_wait_rnb(struct fsl_upm_nand *fun)
 
 static void fun_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
+        struct nand_chip *chip = mtd->priv;
         struct fsl_upm_nand *fun = to_fsl_upm_nand(mtd);
+        u32 mar;
 
         if (!(ctrl & fun->last_ctrl)) {
                 fsl_upm_end_pattern(&fun->upm);
@@ -87,9 +97,28 @@ static void fun_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
                         fsl_upm_start_pattern(&fun->upm, fun->upm_cmd_offset);
         }
 
-        fsl_upm_run_pattern(&fun->upm, fun->io_base, cmd);
+        mar = (cmd << (32 - fun->upm.width)) |
+                fun->mchip_offsets[fun->mchip_number];
+        fsl_upm_run_pattern(&fun->upm, chip->IO_ADDR_R, mar);
+
+        if (fun->wait_flags & FSL_UPM_WAIT_RUN_PATTERN)
+                fun_wait_rnb(fun);
+}
+
+static void fun_select_chip(struct mtd_info *mtd, int mchip_nr)
+{
+        struct nand_chip *chip = mtd->priv;
+        struct fsl_upm_nand *fun = to_fsl_upm_nand(mtd);
 
-        fun_wait_rnb(fun);
+        if (mchip_nr == -1) {
+                chip->cmd_ctrl(mtd, NAND_CMD_NONE, 0 | NAND_CTRL_CHANGE);
+        } else if (mchip_nr >= 0) {
+                fun->mchip_number = mchip_nr;
+                chip->IO_ADDR_R = fun->io_base + fun->mchip_offsets[mchip_nr];
+                chip->IO_ADDR_W = chip->IO_ADDR_R;
+        } else {
+                BUG();
+        }
 }
 
 static uint8_t fun_read_byte(struct mtd_info *mtd)
@@ -115,8 +144,11 @@ static void fun_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 
         for (i = 0; i < len; i++) {
                 out_8(fun->chip.IO_ADDR_W, buf[i]);
-                fun_wait_rnb(fun);
+                if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BYTE)
+                        fun_wait_rnb(fun);
         }
+        if (fun->wait_flags & FSL_UPM_WAIT_WRITE_BUFFER)
+                fun_wait_rnb(fun);
 }
 
 static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
@@ -137,8 +169,10 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
         fun->chip.read_buf = fun_read_buf;
         fun->chip.write_buf = fun_write_buf;
         fun->chip.ecc.mode = NAND_ECC_SOFT;
+        if (fun->mchip_count > 1)
+                fun->chip.select_chip = fun_select_chip;
 
-        if (fun->rnb_gpio >= 0)
+        if (fun->rnb_gpio[0] >= 0)
                 fun->chip.dev_ready = fun_chip_ready;
 
         fun->mtd.priv = &fun->chip;
@@ -155,7 +189,7 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun,
                 goto err;
         }
 
-        ret = nand_scan(&fun->mtd, 1);
+        ret = nand_scan(&fun->mtd, fun->mchip_count);
         if (ret)
                 goto err;
 
@@ -185,8 +219,10 @@ static int __devinit fun_probe(struct of_device *ofdev,
         struct fsl_upm_nand *fun;
         struct resource io_res;
         const uint32_t *prop;
+        int rnb_gpio;
         int ret;
         int size;
+        int i;
 
         fun = kzalloc(sizeof(*fun), GFP_KERNEL);
         if (!fun)
@@ -208,7 +244,7 @@ static int __devinit fun_probe(struct of_device *ofdev,
         if (!prop || size != sizeof(uint32_t)) {
                 dev_err(&ofdev->dev, "can't get UPM address offset\n");
                 ret = -EINVAL;
-                goto err2;
+                goto err1;
         }
         fun->upm_addr_offset = *prop;
 
@@ -216,21 +252,40 @@ static int __devinit fun_probe(struct of_device *ofdev,
         if (!prop || size != sizeof(uint32_t)) {
                 dev_err(&ofdev->dev, "can't get UPM command offset\n");
                 ret = -EINVAL;
-                goto err2;
+                goto err1;
         }
         fun->upm_cmd_offset = *prop;
 
-        fun->rnb_gpio = of_get_gpio(ofdev->node, 0);
-        if (fun->rnb_gpio >= 0) {
-                ret = gpio_request(fun->rnb_gpio, dev_name(&ofdev->dev));
-                if (ret) {
-                        dev_err(&ofdev->dev, "can't request RNB gpio\n");
+        prop = of_get_property(ofdev->node,
+                               "fsl,upm-addr-line-cs-offsets", &size);
+        if (prop && (size / sizeof(uint32_t)) > 0) {
+                fun->mchip_count = size / sizeof(uint32_t);
+                if (fun->mchip_count >= NAND_MAX_CHIPS) {
+                        dev_err(&ofdev->dev, "too much multiple chips\n");
+                        goto err1;
+                }
+                for (i = 0; i < fun->mchip_count; i++)
+                        fun->mchip_offsets[i] = prop[i];
+        } else {
+                fun->mchip_count = 1;
+        }
+
+        for (i = 0; i < fun->mchip_count; i++) {
+                fun->rnb_gpio[i] = -1;
+                rnb_gpio = of_get_gpio(ofdev->node, i);
+                if (rnb_gpio >= 0) {
+                        ret = gpio_request(rnb_gpio, dev_name(&ofdev->dev));
+                        if (ret) {
+                                dev_err(&ofdev->dev,
+                                        "can't request RNB gpio #%d\n", i);
+                                goto err2;
+                        }
+                        gpio_direction_input(rnb_gpio);
+                        fun->rnb_gpio[i] = rnb_gpio;
+                } else if (rnb_gpio == -EINVAL) {
+                        dev_err(&ofdev->dev, "RNB gpio #%d is invalid\n", i);
                         goto err2;
                 }
-                gpio_direction_input(fun->rnb_gpio);
-        } else if (fun->rnb_gpio == -EINVAL) {
-                dev_err(&ofdev->dev, "specified RNB gpio is invalid\n");
-                goto err2;
         }
 
         prop = of_get_property(ofdev->node, "chip-delay", NULL);
@@ -239,8 +294,15 @@ static int __devinit fun_probe(struct of_device *ofdev,
         else
                 fun->chip_delay = 50;
 
+        prop = of_get_property(ofdev->node, "fsl,upm-wait-flags", &size);
+        if (prop && size == sizeof(uint32_t))
+                fun->wait_flags = *prop;
+        else
+                fun->wait_flags = FSL_UPM_WAIT_RUN_PATTERN |
+                                  FSL_UPM_WAIT_WRITE_BYTE;
+
         fun->io_base = devm_ioremap_nocache(&ofdev->dev, io_res.start,
-                                          io_res.end - io_res.start + 1);
+                                            io_res.end - io_res.start + 1);
         if (!fun->io_base) {
                 ret = -ENOMEM;
                 goto err2;
@@ -257,8 +319,11 @@ static int __devinit fun_probe(struct of_device *ofdev,
 
         return 0;
 err2:
-        if (fun->rnb_gpio >= 0)
-                gpio_free(fun->rnb_gpio);
+        for (i = 0; i < fun->mchip_count; i++) {
+                if (fun->rnb_gpio[i] < 0)
+                        break;
+                gpio_free(fun->rnb_gpio[i]);
+        }
 err1:
         kfree(fun);
 
@@ -268,12 +333,16 @@ err1:
 static int __devexit fun_remove(struct of_device *ofdev)
 {
         struct fsl_upm_nand *fun = dev_get_drvdata(&ofdev->dev);
+        int i;
 
         nand_release(&fun->mtd);
         kfree(fun->mtd.name);
 
-        if (fun->rnb_gpio >= 0)
-                gpio_free(fun->rnb_gpio);
+        for (i = 0; i < fun->mchip_count; i++) {
+                if (fun->rnb_gpio[i] < 0)
+                        break;
+                gpio_free(fun->rnb_gpio[i]);
+        }
 
         kfree(fun);