mtd/drivers/mtd/chips jedec_probe.c,1.23,1.24

[Thayne Harbaugh]

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

Modified Files:
	jedec_probe.c 
Log Message:
Order jedec_table[].
Add unlock addresses for all data output widths.
No longer check for ID's in all blocks - just the first one.
Fixed incorrert unlock addresses for some devices (ATMEL? - don' remember).


Index: jedec_probe.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/jedec_probe.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- jedec_probe.c	8 Apr 2003 13:26:05 -0000	1.23
+++ jedec_probe.c	11 Apr 2003 15:08:26 -0000	1.24
@@ -27,8 +27,8 @@
 #define MANUFACTURER_INTEL	0x0089
 #define MANUFACTURER_MACRONIX	0x00C2
 #define MANUFACTURER_PMC	0x009D
-#define MANUFACTURER_ST		0x0020
 #define MANUFACTURER_SST	0x00BF
+#define MANUFACTURER_ST		0x0020
 #define MANUFACTURER_TOSHIBA	0x0098
 #define MANUFACTURER_WINBOND	0x00da
 
@@ -41,7 +41,7 @@
 #define AM29LV160DT	0x22C4
[...1375 lines suppressed...]
+	 * Make sure the ID's dissappear when the device is taken out of
+	 * ID mode.  The only time this should fail when it should succeed
+	 * is when the ID's are written as data to the same
 	 * addresses.  For this rare and unfortunate case the chip
 	 * cannot be probed correctly.
 	 * FIXME - write a driver that takes all of the chip info as
-	 * module parameters.
+	 * module parameters, doesn't probe but forces a load.
 	 */
 	DEBUG( MTD_DEBUG_LEVEL3,
 	       "MTD %s(): check ID's disappear when not in ID mode\n",
@@ -1316,7 +1449,7 @@
 		printk(KERN_INFO "Search for id:(%02x %02x) interleave(%d) type(%d)\n", 
 			cfi->mfr, cfi->id, cfi->interleave, cfi->device_type);
 		for (i=0; i<sizeof(jedec_table)/sizeof(jedec_table[0]); i++) {
-			if ( jedec_match( base, map, cfi, i ) ) {
+			if ( jedec_match( base, map, cfi, &jedec_table[i] ) ) {
 				DEBUG( MTD_DEBUG_LEVEL3,
 				       "MTD %s(): matched device 0x%x,0x%x unlock_addrs: 0x%.4x 0x%.4x\n",
 				       __func__,