Merge branch 'u-boot/master' into u-boot-arm/master

[karo-tx-uboot.git] / board / dave / PPChameleonEVB / nand.c

diff --git a/board/dave/PPChameleonEVB/nand.c b/board/dave/PPChameleonEVB/nand.c
index 09c0b043e7f3039b29b18a6e2081db2cf5dde78c..a191a0c3a920d05758a0a8dcfe3f76bdbfbb60f8 100644 (file)
--- a/board/dave/PPChameleonEVB/nand.c
+++ b/board/dave/PPChameleonEVB/nand.c
@@ -1,27 +1,11 @@
 /*
  * (C) Copyright 2006 DENX Software Engineering
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-
+#include <asm/io.h>
 
 #if defined(CONFIG_CMD_NAND)
 
@@ -31,31 +15,28 @@
  * hardware specific access to control-lines
  * function borrowed from Linux 2.6 (drivers/mtd/nand/ppchameleonevb.c)
  */
-static void ppchameleonevb_hwcontrol(struct mtd_info *mtdinfo, int cmd)
+static void ppchameleonevb_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
-       struct nand_chip *this = mtdinfo->priv;
+       struct nand_chip *this = mtd->priv;
        ulong base = (ulong) this->IO_ADDR_W;
 
-       switch(cmd) {
-       case NAND_CTL_SETCLE:
-               MACRO_NAND_CTL_SETCLE((unsigned long)base);
-               break;
-       case NAND_CTL_CLRCLE:
-               MACRO_NAND_CTL_CLRCLE((unsigned long)base);
-               break;
-       case NAND_CTL_SETALE:
-               MACRO_NAND_CTL_SETALE((unsigned long)base);
-               break;
-       case NAND_CTL_CLRALE:
-               MACRO_NAND_CTL_CLRALE((unsigned long)base);
-               break;
-       case NAND_CTL_SETNCE:
-               MACRO_NAND_ENABLE_CE((unsigned long)base);
-               break;
-       case NAND_CTL_CLRNCE:
-               MACRO_NAND_DISABLE_CE((unsigned long)base);
-               break;
+       if (ctrl & NAND_CTRL_CHANGE) {
+               if ( ctrl & NAND_CLE )
+                       MACRO_NAND_CTL_SETCLE((unsigned long)base);
+               else
+                       MACRO_NAND_CTL_CLRCLE((unsigned long)base);
+               if ( ctrl & NAND_ALE )
+                       MACRO_NAND_CTL_CLRCLE((unsigned long)base);
+               else
+                       MACRO_NAND_CTL_CLRALE((unsigned long)base);
+               if ( ctrl & NAND_NCE )
+                       MACRO_NAND_ENABLE_CE((unsigned long)base);
+               else
+                       MACRO_NAND_DISABLE_CE((unsigned long)base);
        }
+
+       if (cmd != NAND_CMD_NONE)
+               writeb(cmd, this->IO_ADDR_W);
 }
 
 
@@ -70,11 +51,11 @@ static int ppchameleonevb_device_ready(struct mtd_info *mtdinfo)
 
        /* use the base addr to find out which chip are we dealing with */
        switch((ulong) this->IO_ADDR_W) {
-       case CFG_NAND0_BASE:
-               rb_gpio_pin = CFG_NAND0_RDY;
+       case CONFIG_SYS_NAND0_BASE:
+               rb_gpio_pin = CONFIG_SYS_NAND0_RDY;
                break;
-       case CFG_NAND1_BASE:
-               rb_gpio_pin = CFG_NAND1_RDY;
+       case CONFIG_SYS_NAND1_BASE:
+               rb_gpio_pin = CONFIG_SYS_NAND1_RDY;
                break;
        default: /* this should never happen */
                return 0;
@@ -92,11 +73,11 @@ static int ppchameleonevb_device_ready(struct mtd_info *mtdinfo)
  * argument are board-specific (per include/linux/mtd/nand.h):
  * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device
  * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device
- * - hwcontrol: hardwarespecific function for accesing control-lines
+ * - cmd_ctrl: hardwarespecific function for accesing control-lines
  * - dev_ready: hardwarespecific function for  accesing device ready/busy line
  * - enable_hwecc?: function to enable (reset)  hardware ecc generator. Must
  *   only be provided if a hardware ECC is available
- * - eccmode: mode of ecc, see defines
+ * - ecc.mode: mode of ecc, see defines
  * - chip_delay: chip dependent delay for transfering data from array to
  *   read regs (tR)
  * - options: various chip options. They can partly be set to inform
@@ -108,9 +89,9 @@ static int ppchameleonevb_device_ready(struct mtd_info *mtdinfo)
 int board_nand_init(struct nand_chip *nand)
 {
 
-       nand->hwcontrol = ppchameleonevb_hwcontrol;
+       nand->cmd_ctrl = ppchameleonevb_hwcontrol;
        nand->dev_ready = ppchameleonevb_device_ready;
-       nand->eccmode = NAND_ECC_SOFT;
+       nand->ecc.mode = NAND_ECC_SOFT;
        nand->chip_delay = NAND_BIG_DELAY_US;
        nand->options = NAND_SAMSUNG_LP_OPTIONS;
        return 0;