flashchips: change chip name from 'W25Q64JW' to 'W25Q64JW...M'

According to the W25Q64JW datasheet rev. E, only devices ending with the
letter 'M' have a device ID of 8017h. There are other variants with
different device IDs. This patch makes the 'W25Q64JW...M' definition
consistent with the 'W25Q32JW...M' definition.

The device ID macro defined in flashchips.h has also been renamed from
WINBOND_NEX_W25Q64JW to WINBOND_NEX_W25Q64JW_M.

Change-Id: Ib0dc914da286a191d22e666332b1063b88db4251
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/54291
Original-Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/70956
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/flashchips.c b/flashchips.c
index 46f9269..eab7e2e 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -17642,10 +17642,10 @@
 
 	{
 		.vendor		= "Winbond",
-		.name		= "W25Q64JW",
+		.name		= "W25Q64JW...M",
 		.bustype	= BUS_SPI,
 		.manufacture_id	= WINBOND_NEX_ID,
-		.model_id	= WINBOND_NEX_W25Q64JW,
+		.model_id	= WINBOND_NEX_W25Q64JW_M,
 		.total_size	= 8192,
 		.page_size	= 256,
 		/* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
diff --git a/flashchips.h b/flashchips.h
index 47e1436..70fc140 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -968,7 +968,7 @@
 #define WINBOND_NEX_W25Q128_V_M	0x7018	/* W25Q128JVSM */
 #define WINBOND_NEX_W25Q256JV_M	0x7019	/* W25Q256JV_M (QE=0) */
 #define WINBOND_NEX_W25Q32JW_M	0x8016  /* W25Q32JW...M */
-#define WINBOND_NEX_W25Q64JW	0x8017
+#define WINBOND_NEX_W25Q64JW_M	0x8017  /* W25Q64JW...M */
 #define WINBOND_NEX_W25Q128_DTR	0x8018	/* W25Q128JW_DTR */
 #define WINBOND_NEX_W25Q256_DTR	0x8019	/* W25Q256JW_DTR aka W25Q256256JW-IM */