From 932394ac43e2e778e664eeb6e456fecd0fae6e59 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 17 Aug 2005 12:55:25 +0200
Subject: Rewrite of NAND code based on what is in 2.6.12 Linux kernel Patch by
 Ladislav Michl, 29 Jun 2005

---
 include/nand.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 include/nand.h

(limited to 'include/nand.h')

diff --git a/include/nand.h b/include/nand.h
new file mode 100644
index 0000000..29580da
--- /dev/null
+++ b/include/nand.h
@@ -0,0 +1,56 @@
+/*
+ * (C) Copyright 2005
+ * 2N Telekomunikace, a.s. <www.2n.cz>
+ * Ladislav Michl <michl@2n.cz>
+ *
+ * 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
+ * version 2 as published by the Free Software Foundation.
+ *
+ * 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
+ */
+
+#ifndef _NAND_H_
+#define _NAND_H_
+
+#include <linux_compat.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+
+typedef struct mtd_info nand_info_t;
+
+extern int nand_curr_device;
+extern nand_info_t nand_info[];
+
+static inline int nand_read(nand_info_t *info, ulong ofs, ulong *len, u_char *buf)
+{
+	return info->read(info, ofs, *len, len, buf);
+}
+
+static inline int nand_write(nand_info_t *info, ulong ofs, ulong *len, u_char *buf)
+{
+	return info->write(info, ofs, *len, len, buf);
+}
+
+static inline int nand_block_isbad(nand_info_t *info, ulong ofs)
+{
+	return info->block_isbad(info, ofs);
+}
+
+static inline int nand_erase(nand_info_t *info, ulong off, ulong size)
+{
+	return 0; /* FIXME */
+}
+
+#endif
-- 
cgit v1.1


From ac7eb8a315e25863637a8d2c02af18815458b63f Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.denx.de>
Date: Wed, 14 Sep 2005 23:53:32 +0200
Subject: Update of new NAND code Patch by Ladislav Michl, 13 Sep 2005

---
 include/nand.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/nand.h')

diff --git a/include/nand.h b/include/nand.h
index 29580da..6dbaa42 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -24,7 +24,7 @@
 #ifndef _NAND_H_
 #define _NAND_H_
 
-#include <linux_compat.h>
+#include <linux/mtd/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 
-- 
cgit v1.1


From 8e9655f863246db60c51140153186acc2afdc855 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@pollux.(none)>
Date: Wed, 2 Nov 2005 14:29:12 +0100
Subject: * Add hook to NAND erase and implement nand_wait function.   Patch by
 Mike Rapoport, 01 Nov 2005

  Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 include/nand.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'include/nand.h')

diff --git a/include/nand.h b/include/nand.h
index 6dbaa42..3490347 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -50,7 +50,14 @@ static inline int nand_block_isbad(nand_info_t *info, ulong ofs)
 
 static inline int nand_erase(nand_info_t *info, ulong off, ulong size)
 {
-	return 0; /* FIXME */
+	struct erase_info instr;
+
+	instr.mtd = info;
+	instr.addr = off;
+	instr.len = size;
+	instr.callback = 0;
+
+	return info->erase(info, &instr);
 }
 
 #endif
-- 
cgit v1.1