Signed-off-by: Anton Vorontsov <[EMAIL PROTECTED]>
---
 drivers/mtd/nand/fsl_upm.c  |   68 +++++++++++--------------------------------
 include/linux/mtd/fsl_upm.h |    3 ++
 2 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 5cc410a..4775cdc 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -61,51 +61,28 @@ static void fsl_upm_setup(struct fsl_upm *upm)
                eieio();
 }
 
-static void fun_cmdfunc(struct mtd_info *mtd, unsigned command, int column,
-                       int page_addr)
+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 = chip->priv;
 
-       fsl_upm_start_pattern(&fun->upm, fun->upm_cmd_offset);
-
-       if (command == NAND_CMD_SEQIN) {
-               int readcmd;
-
-               if (column >= mtd->oobblock) {
-                       /* OOB area */
-                       column -= mtd->oobblock;
-                       readcmd = NAND_CMD_READOOB;
-               } else if (column < 256) {
-                       /* First 256 bytes --> READ0 */
-                       readcmd = NAND_CMD_READ0;
-               } else {
-                       column -= 256;
-                       readcmd = NAND_CMD_READ1;
-               }
-               fsl_upm_run_pattern(&fun->upm, fun->width, readcmd);
-       }
-
-       fsl_upm_run_pattern(&fun->upm, fun->width, command);
+       if (!(ctrl & fun->last_ctrl)) {
+               fsl_upm_end_pattern(&fun->upm);
 
-       fsl_upm_end_pattern(&fun->upm);
+               if (cmd == NAND_CMD_NONE)
+                       return;
 
-       fsl_upm_start_pattern(&fun->upm, fun->upm_addr_offset);
-
-       if (column != -1)
-               fsl_upm_run_pattern(&fun->upm, fun->width, column);
+               fun->last_ctrl = ctrl & (NAND_ALE | NAND_CLE);
+       }
 
-       if (page_addr != -1) {
-               fsl_upm_run_pattern(&fun->upm, fun->width, page_addr);
-               fsl_upm_run_pattern(&fun->upm, fun->width,
-                                   (page_addr >> 8) & 0xFF);
-               if (chip->chipsize > (32 << 20)) {
-                       fsl_upm_run_pattern(&fun->upm, fun->width,
-                                           (page_addr >> 16) & 0x0f);
-               }
+       if (ctrl & NAND_CTRL_CHANGE) {
+               if (ctrl & NAND_ALE)
+                       fsl_upm_start_pattern(&fun->upm, fun->upm_addr_offset);
+               else if (ctrl & NAND_CLE)
+                       fsl_upm_start_pattern(&fun->upm, fun->upm_cmd_offset);
        }
 
-       fsl_upm_end_pattern(&fun->upm);
+       fsl_upm_run_pattern(&fun->upm, fun->width, cmd);
 
        if (fun->wait_pattern) {
                /*
@@ -119,13 +96,6 @@ static void fun_cmdfunc(struct mtd_info *mtd, unsigned 
command, int column,
        }
 }
 
-static void nand_write_byte(struct mtd_info *mtd, u_char byte)
-{
-       struct nand_chip *chip = mtd->priv;
-
-       out_8(chip->IO_ADDR_W, byte);
-}
-
 static u8 nand_read_byte(struct mtd_info *mtd)
 {
        struct nand_chip *chip = mtd->priv;
@@ -164,10 +134,6 @@ static int nand_verify_buf(struct mtd_info *mtd, const 
u_char *buf, int len)
        return 0;
 }
 
-static void nand_hwcontrol(struct mtd_info *mtd, int cmd)
-{
-}
-
 static int nand_dev_ready(struct mtd_info *mtd)
 {
        struct nand_chip *chip = mtd->priv;
@@ -184,14 +150,14 @@ int fsl_upm_nand_init(struct nand_chip *chip, struct 
fsl_upm_nand *fun)
 
        fsl_upm_setup(&fun->upm);
 
+       fun->last_ctrl = NAND_CLE;
+
        chip->priv = fun;
        chip->chip_delay = fun->chip_delay;
-       chip->eccmode = NAND_ECC_SOFT;
-       chip->cmdfunc = fun_cmdfunc;
-       chip->hwcontrol = nand_hwcontrol;
+       chip->ecc.mode = NAND_ECC_SOFT;
+       chip->cmd_ctrl = fun_cmd_ctrl;
        chip->read_byte = nand_read_byte;
        chip->read_buf = nand_read_buf;
-       chip->write_byte = nand_write_byte;
        chip->write_buf = nand_write_buf;
        chip->verify_buf = nand_verify_buf;
        chip->dev_ready = nand_dev_ready;
diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h
index 634ff02..5f0016d 100644
--- a/include/linux/mtd/fsl_upm.h
+++ b/include/linux/mtd/fsl_upm.h
@@ -32,6 +32,9 @@ struct fsl_upm_nand {
        int wait_pattern;
        int (*dev_ready)(void);
        int chip_delay;
+
+       /* no need to fill */
+       int last_ctrl;
 };
 
 extern int fsl_upm_nand_init(struct nand_chip *chip, struct fsl_upm_nand *fun);
-- 
1.5.2.2

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
U-Boot-Users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/u-boot-users

Reply via email to