[MTD] Refactor NAND hwcontrol to cmd_ctrl

[safe/jmp/linux-2.6] / drivers / mtd / nand / h1910.c

diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index efa53a9..2d585d2 100644 (file)
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2003 Joshua Wise (joshua@joshuawise.com)
  *
  *  Derived from drivers/mtd/nand/edb7312.c
- *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
+ *       Copyright (C) 2002 Marius Gröger (mag@sysgo.de)
  *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
  *
  * $Id: h1910.c,v 1.6 2005/11/07 11:14:30 gleixner Exp $
@@ -56,36 +56,18 @@ static struct mtd_partition partition_info[] = {
 
 /*
  *     hardware specific access to control-lines
+ *
+ *     NAND_NCE: bit 0 - don't care
+ *     NAND_CLE: bit 1 - address bit 2
+ *     NAND_ALE: bit 2 - address bit 3
  */
-static void h1910_hwcontrol(struct mtd_info *mtd, int cmd)
+static void h1910_hwcontrol(struct mtd_info *mtd, int cmd,
+                           unsigned int ctrl)
 {
-       struct nand_chip *this = (struct nand_chip *)(mtd->priv);
-
-       switch (cmd) {
-
-       case NAND_CTL_SETCLE:
-               this->IO_ADDR_R |= (1 << 2);
-               this->IO_ADDR_W |= (1 << 2);
-               break;
-       case NAND_CTL_CLRCLE:
-               this->IO_ADDR_R &= ~(1 << 2);
-               this->IO_ADDR_W &= ~(1 << 2);
-               break;
-
-       case NAND_CTL_SETALE:
-               this->IO_ADDR_R |= (1 << 3);
-               this->IO_ADDR_W |= (1 << 3);
-               break;
-       case NAND_CTL_CLRALE:
-               this->IO_ADDR_R &= ~(1 << 3);
-               this->IO_ADDR_W &= ~(1 << 3);
-               break;
-
-       case NAND_CTL_SETNCE:
-               break;
-       case NAND_CTL_CLRNCE:
-               break;
-       }
+       struct nand_chip *chip = mtd->priv;
+
+       if (cmd != NAND_CMD_NONE)
+               writeb(cmd, chip->IO_ADDR_W | ((ctrl & 0x6) << 1));
 }
 
 /*
@@ -135,6 +117,7 @@ static int __init h1910_init(void)
 
        /* Link the private data with the MTD structure */
        h1910_nand_mtd->priv = this;
+       h1910_nand_mtd->owner = THIS_MODULE;
 
        /*
         * Enable VPEN
@@ -144,11 +127,11 @@ static int __init h1910_init(void)
        /* insert callbacks */
        this->IO_ADDR_R = nandaddr;
        this->IO_ADDR_W = nandaddr;
-       this->hwcontrol = h1910_hwcontrol;
+       this->cmd_ctrl = h1910_hwcontrol;
        this->dev_ready = NULL; /* unknown whether that was correct or not so we will just do it like this */
        /* 15 us command delay time */
        this->chip_delay = 50;
-       this->eccmode = NAND_ECC_SOFT;
+       this->ecc.mode = NAND_ECC_SOFT;
        this->options = NAND_NO_AUTOINCR;
 
        /* Scan to find existence of the device */