Index: flashchips.c
===================================================================
--- flashchips.c	(revision 1091)
+++ flashchips.c	(working copy)
@@ -275,37 +275,6 @@
 	},
 
 	{
-		.vendor		= "ASD",
-		.name		= "AE49F2008",
-		.bustype	= CHIP_BUSTYPE_PARALLEL,
-		.manufacture_id	= ASD_ID,
-		.model_id	= ASD_AE49F2008,
-		.total_size	= 256,
-		.page_size	= 128,
-		.feature_bits	= FEATURE_EITHER_RESET,
-		.tested		= TEST_UNTESTED,
-		.probe		= probe_jedec,
-		.probe_timing	= TIMING_FIXME, 
-		.block_erasers	=
-		{
-			{
-				.eraseblocks = {
-					{128 * 1024, 1},
-					{96 * 1024, 1},
-					{8 * 1024, 2},
-					{16 * 1024, 1},
-				},
-				.block_erase = erase_sector_jedec,
-			}, {
-				.eraseblocks = { {256 * 1024, 1} },
-				.block_erase = erase_chip_block_jedec,
-			}
-		},
-		.write		= write_jedec,
-		.read		= read_memmapped,
-	},
-
-	{
 		.vendor		= "Atmel",
 		.name		= "AT25DF021",
 		.bustype	= CHIP_BUSTYPE_SPI,
@@ -6249,7 +6218,7 @@
 		.name		= "W29C011",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= WINBOND_ID,
-		.model_id	= W_29C011,
+		.model_id	= W_29C010M,
 		.total_size	= 128,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -6272,7 +6241,7 @@
 		.name		= "W29C020C",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= WINBOND_ID,
-		.model_id	= W_29C020C,
+		.model_id	= W_29C020,
 		.total_size	= 256,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -6295,7 +6264,7 @@
 		.name		= "W29C040P",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= WINBOND_ID,
-		.model_id	= W_29C040P,
+		.model_id	= W_29C040,
 		.total_size	= 512,
 		.page_size	= 256,
 		.feature_bits	= FEATURE_LONG_RESET,
@@ -6318,7 +6287,7 @@
 		.name		= "W29EE011",
 		.bustype	= CHIP_BUSTYPE_PARALLEL,
 		.manufacture_id	= WINBOND_ID,
-		.model_id	= W_29C011,
+		.model_id	= W_29C010M,
 		.total_size	= 128,
 		.page_size	= 128,
 		.feature_bits	= FEATURE_LONG_RESET,
Index: flashchips.h
===================================================================
--- flashchips.h	(revision 1091)
+++ flashchips.h	(working copy)
@@ -91,10 +91,6 @@
 #define AMIC_A29L040		0x92
 #define AMIC_A49LF040A		0x9d
 
-/* This chip vendor/device ID is probably a misinterpreted LHA header. */
-#define ASD_ID			0x25	/* ASD, not listed in JEP106W */
-#define ASD_AE49F2008		0x52
-
 #define ATMEL_ID		0x1F	/* Atmel */
 #define AT_25DF021		0x4300
 #define AT_25DF041A		0x4401
@@ -501,7 +497,6 @@
  * W25X chips are SPI, first byte of device ID is memory type, second
  * byte of device ID is related to log(bitsize).
  */
-#define WINBOND_ID		0xDA	/* Winbond */
 #define WINBOND_NEX_ID		0xEF	/* Winbond (ex Nexcom) serial flashes */
 #define W_25X10			0x3011
 #define W_25X20			0x3012
@@ -510,26 +505,44 @@
 #define W_25X16			0x3015
 #define W_25X32			0x3016
 #define W_25X64			0x3017
+#define W_25Q40			0x4013
 #define W_25Q80			0x4014
 #define W_25Q16			0x4015
 #define W_25Q32			0x4016
 #define W_25Q64			0x4017
-#define W_29C011		0xC1
-#define W_29C020C		0x45	/* Same as W29C020 and ASD AE29F2008 */
-#define W_29C040P		0x46	/* Same as W29C040 */
-#define W_29EE011		0xC1
-#define W_39L020		0xB5
-#define W_39L040		0xB6
-#define W_39V040FA		0x34
-#define W_39V040A		0x3D
-#define W_39V040B		0x54
-#define W_39V040C		0x50
-#define W_39V080A		0xD0
-#define W_39V080FA		0xD3
-#define W_39V080FA_DM		0x93
-#define W_49F002U		0x0B
-#define W_49F020		0x8C
-#define W_49V002A		0xB0
-#define W_49V002FA		0x32
+#define W_25Q128		0x4018
 
+#define WINBOND_ID		0xDA	/* Winbond */
+#define W_19B160BB              0x49
+#define W_19B160BT              0xC4
+#define W_19B320SB              0x2A    /* Same as W19L320SB */
+#define W_19B320ST              0xBA    /* Same as W19L320ST */
+#define W_19B322MB              0x92
+#define W_19B322MT              0x10
+#define W_19B323MB              0x94
+#define W_19B323MT              0x13
+#define W_19B324MB              0x97
+#define W_19B324MT              0x16
+#define W_29C010M               0xC1    /* Same as W29C011A, W29EE011, W29EE012, and ASD AE29F1008 */
+#define W_29C020                0x45    /* Same as W29C020C, W29C022 and ASD AE29F2008 */
+#define W_29C040                0x46    /* Same as W29C040P */
+#define W_29C512A               0xC8    /* Same as W29EE512 */
+#define W_39L010                0x31
+#define W_39L020                0xB5
+#define W_39L040                0xB6
+#define W_39L040A               0xD6
+#define W_39L512                0x38
+#define W_39V040A               0x3D
+#define W_39V040FA              0x34
+#define W_39V040B               0x54    /* Same as W39V040FB */
+#define W_39V040C               0x50    /* Same as W39V040FC */
+#define W_39V080A               0xD0
+#define W_39V080FA              0xD3
+#define W_39V080FA_DM           0x93    /* W39V080FA dual mode */
+#define W_49F002                0x25    /* Same as W49F002B */
+#define W_49F002U               0x0B    /* Same as W49F002N and ASD AE49F2008 */
+#define W_49F020                0x8C
+#define W_49V002A               0xB0
+#define W_49V002FA              0x32
+
 #endif /* !FLASHCHIPS_H */