mtd/drivers/mtd/nand nand_ids.c,1.4,1.5

[gleixner at infradead.org]

Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv4971

Modified Files:
	nand_ids.c 
Log Message:
Device id table reworked, new devices added

Index: nand_ids.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/nand_ids.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nand_ids.c	21 May 2003 15:15:08 -0000	1.4
+++ nand_ids.c	28 Mar 2004 19:15:42 -0000	1.5
@@ -2,8 +2,7 @@
  *  drivers/mtd/nandids.c
  *
  *  Copyright (C) 2002 Thomas Gleixner (tglx at linutronix.de)
- *
- *
+  *
  * $Id$
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,26 +12,91 @@
  */
 #include <linux/module.h>
 #include <linux/mtd/nand.h>
-
 /*
 *	Chip ID list
+*	
+*	Name. ID code, pagesize, chipsize in MegaByte, eraseblock size,
+*	options
+* 
+* 	Pagesize; 0, 256, 512
+*	0 	get this information from the extended chip ID
++	256	256 Byte page size
+*	512	512 Byte page size	
 */
 struct nand_flash_dev nand_flash_ids[] = {
-	{"NAND 1MiB 5V", 0x6e, 20, 0x1000, 1},
-	{"NAND 2MiB 5V", 0x64, 21, 0x1000, 1},
-	{"NAND 4MiB 5V", 0x6b, 22, 0x2000, 0},
-	{"NAND 1MiB 3,3V", 0xe8, 20, 0x1000, 1},
-	{"NAND 1MiB 3,3V", 0xec, 20, 0x1000, 1},
-	{"NAND 2MiB 3,3V", 0xea, 21, 0x1000, 1},
-	{"NAND 4MiB 3,3V", 0xd5, 22, 0x2000, 0},
-	{"NAND 4MiB 3,3V", 0xe3, 22, 0x2000, 0},
-	{"NAND 4MiB 3,3V", 0xe5, 22, 0x2000, 0},
-	{"NAND 8MiB 3,3V", 0xd6, 23, 0x2000, 0},
-	{"NAND 8MiB 3,3V", 0xe6, 23, 0x2000, 0},
-	{"NAND 16MiB 3,3V", 0x73, 24, 0x4000, 0},
-	{"NAND 32MiB 3,3V", 0x75, 25, 0x4000, 0},
-	{"NAND 64MiB 3,3V", 0x76, 26, 0x4000, 0},
-	{"NAND 128MiB 3,3V", 0x79, 27, 0x4000, 0},
+	{"NAND 1MiB 5V 8-bit", 		0x6e, 256, 1, 0x1000, 0},
+	{"NAND 2MiB 5V 8-bit", 		0x64, 256, 2, 0x1000, 0},
+	{"NAND 4MiB 5V 8-bit", 		0x6b, 512, 4, 0x2000, 0},
+	{"NAND 1MiB 3,3V 8-bit", 	0xe8, 256, 1, 0x1000, 0},
+	{"NAND 1MiB 3,3V 8-bit", 	0xec, 256, 1, 0x1000, 0},
+	{"NAND 2MiB 3,3V 8-bit", 	0xea, 256, 2, 0x1000, 0},
+	{"NAND 4MiB 3,3V 8-bit", 	0xd5, 512, 4, 0x2000, 0},
+	{"NAND 4MiB 3,3V 8-bit", 	0xe3, 512, 4, 0x2000, 0},
+	{"NAND 4MiB 3,3V 8-bit", 	0xe5, 512, 4, 0x2000, 0},
+	{"NAND 8MiB 3,3V 8-bit", 	0xd6, 512, 8, 0x2000, 0},
+	
+	{"NAND 8MiB 1,8V 8-bit", 	0x39, 512, 8, 0x2000, 0},
+	{"NAND 8MiB 3,3V 8-bit", 	0xe6, 512, 8, 0x2000, 0},
+	{"NAND 8MiB 1,8V 16-bit", 	0x49, 512, 8, 0x2000, 0},
+	{"NAND 8MiB 3,3V 16-bit", 	0x59, 512, 8, 0x2000, 0},
+	
+	{"NAND 16MiB 1,8V 8-bit", 	0x33, 512, 16, 0x4000, 0},
+	{"NAND 16MiB 3,3V 8-bit", 	0x73, 512, 16, 0x4000, 0},
+	{"NAND 16MiB 1,8V 16-bit", 	0x43, 512, 16, 0x4000, 0},
+	{"NAND 16MiB 3,3V 16-bit", 	0x53, 512, 16, 0x4000, 0},
+	
+	{"NAND 32MiB 1,8V 8-bit", 	0x35, 512, 32, 0x4000, 0},
+	{"NAND 32MiB 3,3V 8-bit", 	0x75, 512, 32, 0x4000, 0},
+	{"NAND 32MiB 1,8V 16-bit", 	0x45, 512, 32, 0x4000, 0},
+	{"NAND 32MiB 3,3V 16-bit", 	0x55, 512, 32, 0x4000, 0},
+	
+	{"NAND 64MiB 1,8V 8-bit", 	0x36, 512, 64, 0x4000, 0},
+	{"NAND 64MiB 3,3V 8-bit", 	0x76, 512, 64, 0x4000, 0},
+	{"NAND 64MiB 1,8V 16-bit", 	0x46, 512, 64, 0x4000, 0},
+	{"NAND 64MiB 3,3V 16-bit", 	0x56, 512, 64, 0x4000, 0},
+	
+	{"NAND 128MiB 1,8V 8-bit", 	0x78, 512, 128, 0x4000, 0},
+	{"NAND 128MiB 3,3V 8-bit", 	0x79, 512, 128, 0x4000, 0},
+	{"NAND 128MiB 1,8V 16-bit", 	0x72, 512, 128, 0x4000, 0},
+	{"NAND 128MiB 3,3V 16-bit", 	0x74, 512, 128, 0x4000, 0},
+	
+	{"NAND 256MiB 3,3V 8-bit", 	0x71, 512, 256, 0x4000, 0},
+
+	{"NAND 512MiB 3,3V 8-bit", 	0xDC, 512, 512, 0x4000, 0},
+	
+	/* These are the new chips with large page size. The pagesize
+	* and the erasesize is determined from the extended id bytes
+	*/
+	/* 1 Gigabit */
+	{"NAND 128MiB 1,8V 8-bit", 	0xA1, 0, 128, 0, 0},
+	{"NAND 128MiB 3,3V 8-bit", 	0xF1, 0, 128, 0, 0},
+	{"NAND 128MiB 1,8V 16-bit", 	0xB1, 0, 128, 0, 0},
+	{"NAND 128MiB 3,3V 16-bit", 	0xC1, 0, 128, 0, 0},
+	
+	/* 2 Gigabit */
+	{"NAND 256MiB 1,8V 8-bit", 	0xAA, 0, 256, 0, 0},
+	{"NAND 256MiB 3,3V 8-bit", 	0xDA, 0, 256, 0, 0},
+	{"NAND 256MiB 1,8V 16-bit", 	0xBA, 0, 256, 0, 0},
+	{"NAND 256MiB 3,3V 16-bit", 	0xCA, 0, 256, 0, 0},
+	
+	/* 4 Gigabit */
+	{"NAND 512MiB 1,8V 8-bit", 	0xAC, 0, 512, 0, 0},
+	{"NAND 512MiB 3,3V 8-bit", 	0xDC, 0, 512, 0, 0},
+	{"NAND 512MiB 1,8V 16-bit", 	0xBC, 0, 512, 0, 0},
+	{"NAND 512MiB 3,3V 16-bit", 	0xCC, 0, 512, 0, 0},
+	
+	/* 8 Gigabit */
+	{"NAND 1GiB 1,8V 8-bit", 	0xA3, 0, 1024, 0, 0},
+	{"NAND 1GiB 3,3V 8-bit", 	0xD3, 0, 1024, 0, 0},
+	{"NAND 1GiB 1,8V 16-bit", 	0xB3, 0, 1024, 0, 0},
+	{"NAND 1GiB 3,3V 16-bit", 	0xC3, 0, 1024, 0, 0},
+
+	/* 16 Gigabit */
+	{"NAND 2GiB 1,8V 8-bit", 	0xA5, 0, 2048, 0, 0},
+	{"NAND 2GiB 3,3V 8-bit", 	0xD5, 0, 2048, 0, 0},
+	{"NAND 2GiB 1,8V 16-bit", 	0xB5, 0, 2048, 0, 0},
+	{"NAND 2GiB 3,3V 16-bit", 	0xC5, 0, 2048, 0, 0},
+	
 	{NULL,}
 };
 
@@ -46,7 +110,6 @@
 	{NAND_MFR_NATIONAL, "National"},
 	{0x0, "Unknown"}
 };
-
 
 EXPORT_SYMBOL (nand_manuf_ids);
 EXPORT_SYMBOL (nand_flash_ids);