ALSA: wm8750: add missing VREF output

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

diff --git a/drivers/mtd/nand/h1910.c b/drivers/mtd/nand/h1910.c
index 06e91fa11b34a5f931581585c9bc5ac2b3c1444c..f8ce79b446ed8278a20bab97ec1160eca2f2b52d 100644 (file)
--- a/drivers/mtd/nand/h1910.c
+++ b/drivers/mtd/nand/h1910.c
@@ -7,8 +7,6 @@
  *       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 $
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -26,10 +24,10 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
-#include <asm/arch/hardware.h> /* for CLPS7111_VIRT_BASE */
+#include <mach/hardware.h>     /* for CLPS7111_VIRT_BASE */
 #include <asm/sizes.h>
-#include <asm/arch/h1900-gpio.h>
-#include <asm/arch/ipaq.h>
+#include <mach/h1900-gpio.h>
+#include <mach/ipaq.h>
 
 /*
  * MTD structure for EDB7312 board
@@ -56,36 +54,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));
 }
 
 /*
@@ -145,7 +125,7 @@ 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;