83xx, kmeter1: added NAND support

Signed-off-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 55eee3c9baf32a86f3479b9fd7891d45067b916c..624310306ed3d03fba967b99ab980ee5d8a5bc6f 100644 (file)
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -40,6 +40,7 @@ COBJS-$(CONFIG_NAND_FSL_ELBC) += fsl_elbc_nand.o
 COBJS-$(CONFIG_NAND_FSL_UPM) += fsl_upm.o
 COBJS-$(CONFIG_NAND_KB9202) += kb9202_nand.o
 COBJS-$(CONFIG_NAND_KIRKWOOD) += kirkwood_nand.o
+COBJS-$(CONFIG_NAND_KMETER1) += kmeter1_nand.o
 COBJS-$(CONFIG_NAND_MPC5121_NFC) += mpc5121_nfc.o
 COBJS-$(CONFIG_NAND_NDFC) += ndfc.o
 COBJS-$(CONFIG_NAND_NOMADIK) += nomadik.o

diff --git a/drivers/mtd/nand/kmeter1_nand.c b/drivers/mtd/nand/kmeter1_nand.c
new file mode 100644 (file)
index 0000000..e8e5b7b
--- /dev/null
+++ b/drivers/mtd/nand/kmeter1_nand.c
@@ -0,0 +1,135 @@
+/*
+ * (C) Copyright 2009
+ * Heiko Schocher, DENX Software Engineering, hs@denx.de
+ *
+ * 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
+ */
+
+#include <common.h>
+#include <nand.h>
+#include <asm/io.h>
+
+#define CONFIG_NAND_MODE_REG   (void *)(CONFIG_SYS_NAND_BASE + 0x20000)
+#define CONFIG_NAND_DATA_REG   (void *)(CONFIG_SYS_NAND_BASE + 0x30000)
+
+#define read_mode()    in_8(CONFIG_NAND_MODE_REG)
+#define write_mode(val)        out_8(CONFIG_NAND_MODE_REG, val)
+#define read_data()    in_8(CONFIG_NAND_DATA_REG)
+#define write_data(val)        out_8(CONFIG_NAND_DATA_REG, val)
+
+#define KPN_RDY2       (1 << 7)
+#define KPN_RDY1       (1 << 6)
+#define KPN_WPN                (1 << 4)
+#define KPN_CE2N       (1 << 3)
+#define KPN_CE1N       (1 << 2)
+#define KPN_ALE                (1 << 1)
+#define KPN_CLE                (1 << 0)
+
+#define KPN_DEFAULT_CHIP_DELAY 50
+
+static int kpn_chip_ready(void)
+{
+       if (read_mode() & KPN_RDY1)
+               return 1;
+
+       return 0;
+}
+
+static void kpn_wait_rdy(void)
+{
+       int cnt = 1000000;
+
+       while (--cnt && !kpn_chip_ready())
+               udelay(1);
+
+       if (!cnt)
+               printf ("timeout while waiting for RDY\n");
+}
+
+static void kpn_nand_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+       u8 reg_val = read_mode();
+
+       if (ctrl & NAND_CTRL_CHANGE) {
+               reg_val = reg_val & ~(KPN_ALE + KPN_CLE);
+
+               if (ctrl & NAND_CLE)
+                       reg_val = reg_val | KPN_CLE;
+               if (ctrl & NAND_ALE)
+                       reg_val = reg_val | KPN_ALE;
+               if (ctrl & NAND_NCE)
+                       reg_val = reg_val & ~KPN_CE1N;
+               else
+                       reg_val = reg_val | KPN_CE1N;
+
+               write_mode(reg_val);
+       }
+       if (cmd != NAND_CMD_NONE)
+               write_data(cmd);
+
+       /* wait until flash is ready */
+       kpn_wait_rdy();
+}
+
+static u_char kpn_nand_read_byte(struct mtd_info *mtd)
+{
+       return read_data();
+}
+
+static void kpn_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
+{
+       int i;
+
+       for (i = 0; i < len; i++) {
+               write_data(buf[i]);
+               kpn_wait_rdy();
+       }
+}
+
+static void kpn_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+{
+       int i;
+
+       for (i = 0; i < len; i++)
+               buf[i] = read_data();
+}
+
+static int kpn_nand_dev_ready(struct mtd_info *mtd)
+{
+       kpn_wait_rdy();
+
+       return 1;
+}
+
+int board_nand_init(struct nand_chip *nand)
+{
+       nand->ecc.mode = NAND_ECC_SOFT;
+
+       /* Reference hardware control function */
+       nand->cmd_ctrl  = kpn_nand_hwcontrol;
+       nand->read_byte  = kpn_nand_read_byte;
+       nand->write_buf  = kpn_nand_write_buf;
+       nand->read_buf   = kpn_nand_read_buf;
+       nand->dev_ready  = kpn_nand_dev_ready;
+       nand->chip_delay = KPN_DEFAULT_CHIP_DELAY;
+
+       /* reset mode register */
+       write_mode(KPN_CE1N + KPN_CE2N + KPN_WPN);
+       return 0;
+}

diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 869fd4ca1a734b6fc6eab44048884f4ea3cc27c4..79d8638fe2840bc23f3adae942d6ea9447b5475f 100644 (file)
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -324,6 +324,12 @@
 #define CONFIG_SYS_DTT_HYSTERESIS      3
 #define CONFIG_SYS_DTT_BUS_NUM         (CONFIG_SYS_MAX_I2C_BUS)
 
+#if defined(CONFIG_CMD_NAND)
+#define CONFIG_NAND_KMETER1
+#define CONFIG_SYS_MAX_NAND_DEVICE     1
+#define CONFIG_SYS_NAND_BASE           CONFIG_SYS_PIGGY_BASE
+#endif
+
 #if defined(CONFIG_PCI)
 #define CONFIG_CMD_PCI
 #endif