mtd/drivers/mtd/chips jedec_probe.c,1.14,1.15

[David Woodhouse]

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

Modified Files:
	jedec_probe.c 
Log Message:
From: Ales Makarov <ales.makarov at wolfhill.cz>
I also have removed the duplicity in definition of Macronix MX29F016 and
corrected the dev_id for MX29F004T. There were bad erase-regions for
Atmel AT49BV16X(4T). I have doublechecked the datasheet and now should
be OK.


Index: jedec_probe.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/jedec_probe.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jedec_probe.c	25 Apr 2002 12:03:18 -0000	1.14
+++ jedec_probe.c	17 May 2002 08:48:57 -0000	1.15
@@ -45,10 +45,15 @@
 
 /* Atmel */
 #define AT49BV512	0x0003
-#define AT49BV16X4	0x00c0
-#define AT49BV16X4T	0x00c2
+#define AT49BV16X	0x00C0
+#define AT49BV16XT	0x00C2
+#define AT49BV32X	0x00C8
+#define AT49BV32XT	0x00C9
 
 /* Fujitsu */
+#define MBM29LV650UE	0x22D7
+#define MBM29LV320TE	0x22F6
+#define MBM29LV320BE	0x22F9
 #define MBM29LV160TE	0x22C4
 #define MBM29LV160BE	0x2249
 #define MBM29LV800BA	0x225B
@@ -79,6 +84,8 @@
 #define I82802AC	0x00ac
 
 /* Macronix */
+#define MX29LV160T	0x22C4
+#define MX29LV160B	0x2249
 #define MX29F016	0x00AD
 #define MX29F004T	0x0045
 #define MX29F004B	0x0046
@@ -217,6 +224,35 @@
 		}
 	}, {
 		mfr_id: MANUFACTURER_FUJITSU,
+		dev_id: MBM29LV650UE,
+		name: "Fujitsu MBM29LV650UE",
+		DevSize: SIZE_8MiB,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 1,
+		regions: {ERASEINFO(0x10000,128)
+		}
+	}, {
+		mfr_id: MANUFACTURER_FUJITSU,
+		dev_id: MBM29LV320TE,
+		name: "Fujitsu MBM29LV320TE",
+		DevSize: SIZE_4MiB,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 2,
+		regions: {ERASEINFO(0x10000,63),
+			  ERASEINFO(0x02000,8)
+		}
+	}, {
+		mfr_id: MANUFACTURER_FUJITSU,
+		dev_id: MBM29LV320BE,
+		name: "Fujitsu MBM29LV320BE",
+		DevSize: SIZE_4MiB,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 2,
+		regions: {ERASEINFO(0x02000,8),
+			  ERASEINFO(0x10000,63)
+		}
+	}, {
+		mfr_id: MANUFACTURER_FUJITSU,
 		dev_id: MBM29LV160TE,
 		name: "Fujitsu MBM29LV160TE",
 		DevSize: SIZE_2MiB,
@@ -602,26 +638,44 @@
 		}
 	}, {
 		mfr_id: MANUFACTURER_ATMEL,
-		dev_id: AT49BV16X4,
-		name: "Atmel AT49BV16X4",
+		dev_id: AT49BV16X,
+		name: "Atmel AT49BV16X",
 		DevSize: SIZE_2MiB,
-		CmdSet:	P_ID_AMD_STD,
-		NumEraseRegions: 3,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 2,
+		regions: {ERASEINFO(0x02000,8),
+			  ERASEINFO(0x10000,31)
+		}
+	}, {
+		mfr_id: MANUFACTURER_ATMEL,
+		dev_id: AT49BV16XT,
+		name: "Atmel AT49BV16XT",
+		DevSize: SIZE_2MiB,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 2,
+		regions: {ERASEINFO(0x10000,31),
+			  ERASEINFO(0x02000,8)
+		}
+	}, {
+		mfr_id: MANUFACTURER_ATMEL,
+		dev_id: AT49BV32X,
+		name: "Atmel AT49BV32X",
+		DevSize: SIZE_4MiB,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 2,
 		regions: {ERASEINFO(0x02000,8),
-			  ERASEINFO(0x08000,2),
-			  ERASEINFO(0x10000,30)
+			  ERASEINFO(0x10000,63)
 		}
 	}, {
-                mfr_id: MANUFACTURER_ATMEL,
-                dev_id: AT49BV16X4T,
-                name: "Atmel AT49BV16X4T",
-                DevSize: SIZE_2MiB,
-		CmdSet:	P_ID_AMD_STD,
-                NumEraseRegions: 3,
-                regions: {ERASEINFO(0x10000,30),
-                          ERASEINFO(0x08000,2),
+		mfr_id: MANUFACTURER_ATMEL,
+		dev_id: AT49BV32XT,
+		name: "Atmel AT49BV32XT",
+		DevSize: SIZE_4MiB,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 2,
+		regions: {ERASEINFO(0x10000,63),
 			  ERASEINFO(0x02000,8)
-                }
+		}
 	}, {
 		mfr_id: MANUFACTURER_AMD,
 		dev_id: AM29F017D,
@@ -669,12 +723,27 @@
 		}
 	}, {
 		mfr_id: MANUFACTURER_MACRONIX,
-		dev_id: MX29F016,
-		name: "AMD AM29F016",
+		dev_id: MX29LV160T,
+		name: "MXIC MX29LV160T",
 		DevSize: SIZE_2MiB,
 		CmdSet: P_ID_AMD_STD,
-		NumEraseRegions: 1,
-		regions: {ERASEINFO(0x10000,32),
+		NumEraseRegions: 4,
+		regions: {ERASEINFO(0x10000,31),
+			  ERASEINFO(0x08000,1),
+			  ERASEINFO(0x02000,2),
+			  ERASEINFO(0x04000,1)
+		}
+	}, {
+		mfr_id: MANUFACTURER_MACRONIX,
+		dev_id: MX29LV160B,
+		name: "MXIC MX29LV160B",
+		DevSize: SIZE_2MiB,
+		CmdSet: P_ID_AMD_STD,
+		NumEraseRegions: 4,
+		regions: {ERASEINFO(0x04000,1),
+			  ERASEINFO(0x02000,2),
+			  ERASEINFO(0x08000,1),
+			  ERASEINFO(0x10000,31)
 		}
 	}, {
 		mfr_id: MANUFACTURER_MACRONIX,
@@ -699,7 +768,7 @@
 		}
         }, {
 		mfr_id: MANUFACTURER_MACRONIX,
-		dev_id: MX29F004T,
+		dev_id: MX29F004B,
 		name: "Macronix MX29F004B",
 		DevSize: SIZE_512KiB,
 		CmdSet: P_ID_AMD_STD,