imported Ka-Ro specific additions to U-Boot 2009.08 for TX28

[karo-tx-uboot.git] / board / prodrive / pdnb3 / nand.c

diff --git a/board/prodrive/pdnb3/nand.c b/board/prodrive/pdnb3/nand.c
index 1931d64de0c47b67c90eb2209b79814628e1781f..2efe027ec1f822ea4a52a7d43a39b86f66415711 100755 (executable)
--- a/board/prodrive/pdnb3/nand.c
+++ b/board/prodrive/pdnb3/nand.c
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 
 #include <nand.h>
 
@@ -52,40 +52,26 @@ static struct pdnb3_ndfc_regs *pdnb3_ndfc;
  *
  * There is one NAND devices on the board, a Hynix HY27US08561A (32 MByte).
  */
-static void pdnb3_nand_hwcontrol(struct mtd_info *mtd, int cmd)
+static void pdnb3_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
-       switch (cmd) {
-       case NAND_CTL_SETCLE:
-               hwctl |= 0x1;
-               break;
-       case NAND_CTL_CLRCLE:
-               hwctl &= ~0x1;
-               break;
-
-       case NAND_CTL_SETALE:
-               hwctl |= 0x2;
-               break;
-       case NAND_CTL_CLRALE:
-               hwctl &= ~0x2;
-               break;
-
-       case NAND_CTL_SETNCE:
-               break;
-       case NAND_CTL_CLRNCE:
-               writeb(0x00, &(pdnb3_ndfc->term));
-               break;
+       struct nand_chip *this = mtd->priv;
+
+       if (ctrl & NAND_CTRL_CHANGE) {
+               if ( ctrl & NAND_CLE )
+                       hwctl |= 0x1;
+               else
+                       hwctl &= ~0x1;
+               if ( ctrl & NAND_ALE )
+                       hwctl |= 0x2;
+               else
+                       hwctl &= ~0x2;
+               if ( (ctrl & NAND_NCE) != NAND_NCE)
+                       writeb(0x00, &(pdnb3_ndfc->term));
        }
+       if (cmd != NAND_CMD_NONE)
+               writeb(cmd, this->IO_ADDR_W);
 }
 
-static void pdnb3_nand_write_byte(struct mtd_info *mtd, u_char byte)
-{
-       if (hwctl & 0x1)
-               writeb(byte, &(pdnb3_ndfc->cmd));
-       else if (hwctl & 0x2)
-               writeb(byte, &(pdnb3_ndfc->addr));
-       else
-               writeb(byte, &(pdnb3_ndfc->data));
-}
 
 static u_char pdnb3_nand_read_byte(struct mtd_info *mtd)
 {
@@ -148,24 +134,22 @@ static int pdnb3_nand_dev_ready(struct mtd_info *mtd)
        return 1;
 }
 
-void board_nand_init(struct nand_chip *nand)
+int board_nand_init(struct nand_chip *nand)
 {
-       pdnb3_ndfc = (struct pdnb3_ndfc_regs *)CFG_NAND_BASE;
+       pdnb3_ndfc = (struct pdnb3_ndfc_regs *)CONFIG_SYS_NAND_BASE;
 
-       nand->eccmode = NAND_ECC_SOFT;
+       nand->ecc.mode = NAND_ECC_SOFT;
 
        /* Set address of NAND IO lines (Using Linear Data Access Region) */
        nand->IO_ADDR_R = (void __iomem *) ((ulong) pdnb3_ndfc + 0x4);
        nand->IO_ADDR_W = (void __iomem *) ((ulong) pdnb3_ndfc + 0x4);
        /* Reference hardware control function */
-       nand->hwcontrol  = pdnb3_nand_hwcontrol;
-       /* Set command delay time */
-       nand->hwcontrol  = pdnb3_nand_hwcontrol;
-       nand->write_byte = pdnb3_nand_write_byte;
+       nand->cmd_ctrl   = pdnb3_nand_hwcontrol;
        nand->read_byte  = pdnb3_nand_read_byte;
        nand->write_buf  = pdnb3_nand_write_buf;
        nand->read_buf   = pdnb3_nand_read_buf;
        nand->verify_buf = pdnb3_nand_verify_buf;
        nand->dev_ready  = pdnb3_nand_dev_ready;
+       return 0;
 }
 #endif