[U-Boot-Users] [PATCH 3/5] nand: FSL UPM NAND driver

[Anton Vorontsov <avorontsov@ru.mvista.com>]

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 drivers/mtd/nand/Makefile   |    2 +
 drivers/mtd/nand/fsl_upm.c  |  188 +++++++++++++++++++++++++++++++++++++++++++
 include/linux/mtd/fsl_upm.h |   34 ++++++++
 3 files changed, 224 insertions(+), 0 deletions(-)
 create mode 100644 drivers/mtd/nand/fsl_upm.c
 create mode 100644 include/linux/mtd/fsl_upm.h

diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 42864f9..244fa09 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -32,6 +32,8 @@ COBJS-y += nand_ecc.o
 COBJS-y += nand_bbt.o
 COBJS-y += nand_util.o
 
+COBJS-y += fsl_upm.o
+
 COBJS	:= $(COBJS-y)
 SRCS 	:= $(COBJS:.o=.c)
 OBJS 	:= $(addprefix $(obj),$(COBJS))
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
new file mode 100644
index 0000000..81d03e7
--- /dev/null
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -0,0 +1,188 @@
+/*
+ * FSL UPM NAND driver
+ *
+ * Copyright (C) 2007 MontaVista Software, Inc.
+ *                    Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * 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.
+ */
+
+#include <config.h>
+
+#if defined(CONFIG_CMD_NAND) && defined(CONFIG_NAND_FSL_UPM)
+#include <common.h>
+#include <asm/io.h>
+#include <asm/errno.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/fsl_upm.h>
+#include <nand.h>
+
+#define FSL_UPM_MxMR_OP_NO (0 << 28) /* normal operation */
+#define FSL_UPM_MxMR_OP_WA (1 << 28) /* write array */
+#define FSL_UPM_MxMR_OP_RA (2 << 28) /* read array */
+#define FSL_UPM_MxMR_OP_RP (3 << 28) /* run pattern */
+
+void run_pattern(struct upm_data *ud, u32 cmd, u32 pat_offset)
+{
+	out_be32(ud->upm_mxmr, FSL_UPM_MxMR_OP_RP | pat_offset);
+	out_be32(ud->upm_mar, cmd << 24);
+	out_8(ud->base, 0x0);
+
+	if (ud->wait_pattern) {
+		/*
+		 * Some boards/chips needs this. At least on MPC8360E-RDK we
+		 * need it. Probably weird chip, because I don't see any need
+		 * for this on MPC8555E + Samsung K9F1G08U0A. Usually here are
+		 * 0-2 unexpected busy states per block read.
+		 */
+		while (!ud->dev_ready())
+			debug("unexpected busy state\n");
+	}
+
+	/* back to normal operation */
+	out_be32(ud->upm_mxmr, FSL_UPM_MxMR_OP_NO);
+	while (in_be32(ud->upm_mxmr) != FSL_UPM_MxMR_OP_NO)
+		eieio();
+}
+
+static void setup_upm(struct upm_data *ud)
+{
+	int i;
+
+	/* write upm array */
+	out_be32(ud->upm_mxmr, FSL_UPM_MxMR_OP_WA);
+
+	for (i = 0; i < 64; i++) {
+		out_be32(ud->upm_mdr, ud->upm_table[i]);
+		out_8(ud->base, 0x0);
+	}
+
+	/* normal operation */
+	out_be32(ud->upm_mxmr, FSL_UPM_MxMR_OP_NO);
+	while (in_be32(ud->upm_mxmr) != FSL_UPM_MxMR_OP_NO)
+		eieio();
+}
+
+static void nand_cmdfunc(struct mtd_info *mtd, unsigned command, int column,
+			 int page_addr)
+{
+	struct nand_chip *chip = mtd->priv;
+	struct upm_data *ud = chip->priv;
+
+	if (command == NAND_CMD_SEQIN) {
+		int readcmd;
+
+		if (column >= mtd->oobblock) {
+			/* OOB area */
+			column -= mtd->oobblock;
+			readcmd = NAND_CMD_READOOB;
+		} else if (column < 256) {
+			/* First 256 bytes --> READ0 */
+			readcmd = NAND_CMD_READ0;
+		} else {
+			column -= 256;
+			readcmd = NAND_CMD_READ1;
+		}
+		run_pattern(ud, readcmd, ud->upm_cmd_offset);
+	}
+
+	run_pattern(ud, command, ud->upm_cmd_offset);
+
+	if (column != -1)
+		run_pattern(ud, column, ud->upm_addr_offset);
+
+	if (page_addr != -1) {
+		run_pattern(ud, page_addr, ud->upm_addr_offset);
+		run_pattern(ud, (page_addr >> 8) & 0xFF, ud->upm_addr_offset);
+		if (chip->chipsize > (32 << 20))
+			run_pattern(ud, (page_addr >> 16) & 0x0f,
+				    ud->upm_addr_offset);
+	}
+
+	while (!ud->dev_ready())
+		continue;
+}
+
+static void nand_write_byte(struct mtd_info *mtd, u_char byte)
+{
+	struct nand_chip *chip = mtd->priv;
+
+	out_8(chip->IO_ADDR_W, byte);
+}
+
+static u8 nand_read_byte(struct mtd_info *mtd)
+{
+	struct nand_chip *chip = mtd->priv;
+
+	return in_8(chip->IO_ADDR_R);
+}
+
+static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
+{
+	int i;
+	struct nand_chip *chip = mtd->priv;
+
+	for (i = 0; i < len; i++)
+		chip->write_byte(mtd, buf[i]);
+}
+
+static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+{
+	int i;
+	struct nand_chip *chip = mtd->priv;
+
+	for (i = 0; i < len; i++)
+		buf[i] = in_8(chip->IO_ADDR_R);
+}
+
+static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
+{
+	int i;
+	struct nand_chip *chip = mtd->priv;
+
+	for (i = 0; i < len; i++) {
+		if (buf[i] != in_8(chip->IO_ADDR_R))
+			return -EFAULT;
+	}
+
+	return 0;
+}
+
+static void nand_hwcontrol(struct mtd_info *mtd, int cmd)
+{
+}
+
+static int nand_dev_ready(struct mtd_info *mtd)
+{
+	struct nand_chip *chip = mtd->priv;
+	struct upm_data *ud = chip->priv;
+
+	return ud->dev_ready();
+}
+
+int fsl_upm_nand_init(struct nand_chip *chip, struct upm_data *ud)
+{
+	/* yet only 8 bit accessors implemented */
+	if (ud->width != 1)
+		return -ENOSYS;
+
+	setup_upm(ud);
+
+	chip->priv = ud;
+	chip->chip_delay = ud->chip_delay;
+	chip->eccmode = NAND_ECC_SOFT;
+	chip->hwcontrol = nand_hwcontrol;
+	chip->cmdfunc = nand_cmdfunc;
+	chip->read_byte = nand_read_byte;
+	chip->write_byte = nand_write_byte;
+	chip->read_buf = nand_read_buf;
+	chip->write_buf = nand_write_buf;
+	chip->verify_buf = nand_verify_buf;
+	chip->dev_ready = nand_dev_ready;
+
+	return 0;
+}
+#endif /* CONFIG_CMD_NAND */
diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h
new file mode 100644
index 0000000..1ac7158
--- /dev/null
+++ b/include/linux/mtd/fsl_upm.h
@@ -0,0 +1,34 @@
+/*
+ * FSL UPM NAND driver
+ *
+ * Copyright (C) 2007 MontaVista Software, Inc.
+ *                    Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * 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.
+ */
+
+#ifndef __LINUX_MTD_NAND_FSL_UPM
+#define __LINUX_MTD_NAND_FSL_UPM
+
+#include <linux/mtd/nand.h>
+
+struct upm_data {
+	int width;
+	void *base;
+	void *upm_mxmr;
+	void *upm_mdr;
+	void *upm_mar;
+	u32 *upm_table;
+	int upm_cmd_offset;
+	int upm_addr_offset;
+	int wait_pattern;
+	int (*dev_ready)(void);
+	int chip_delay;
+};
+
+extern int fsl_upm_nand_init(struct nand_chip *chip, struct upm_data *ud);
+
+#endif
-- 
1.5.2.2