Import chip ID defines from upstream
Second batch: those that need to be renamed to match upstream.
BUG=chromium:478356
BRANCH=none
TEST=still builds
Change-Id: If1d264a3ae158366bc940092ac88e85360727cb1
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://chromium-review.googlesource.com/439168
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
diff --git a/flashchips.c b/flashchips.c
index 1ffbb5a..e00bac8 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -9510,7 +9510,7 @@
.name = "W25Q80",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q80,
+ .model_id = WINBOND_NEX_W25Q80_V,
.total_size = 1024,
.page_size = 256,
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
@@ -9549,7 +9549,7 @@
.name = "W25Q16",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q16,
+ .model_id = WINBOND_NEX_W25Q16_V,
.total_size = 2048,
.page_size = 256,
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
@@ -9588,7 +9588,7 @@
.name = "W25Q32",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q32,
+ .model_id = WINBOND_NEX_W25Q32_V,
.total_size = 4096,
.page_size = 256,
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
@@ -9627,7 +9627,7 @@
.name = "W25Q32DW",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q32DW,
+ .model_id = WINBOND_NEX_W25Q32_W,
.total_size = 4096,
.page_size = 256,
.feature_bits = FEATURE_WRSR_WREN | FEATURE_UNBOUND_READ,
@@ -9665,7 +9665,7 @@
.name = "W25Q64",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q64,
+ .model_id = WINBOND_NEX_W25Q64_V,
.total_size = 8192,
.page_size = 256,
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
@@ -9704,7 +9704,7 @@
.name = "W25Q64DW",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q64DW,
+ .model_id = WINBOND_NEX_W25Q64_W,
.total_size = 8192,
.page_size = 256,
.feature_bits = FEATURE_WRSR_WREN | FEATURE_UNBOUND_READ,
@@ -9742,7 +9742,7 @@
.name = "W25Q128",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q128,
+ .model_id = WINBOND_NEX_W25Q128_V,
.total_size = 16384,
.page_size = 256,
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
@@ -9780,7 +9780,7 @@
.name = "W25Q128FW",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q128FW,
+ .model_id = WINBOND_NEX_W25Q128_W,
.total_size = 16384,
.page_size = 256,
.feature_bits = FEATURE_WRSR_WREN | FEATURE_UNBOUND_READ,
diff --git a/flashchips.h b/flashchips.h
index 49d409d..a0c8fde 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -920,21 +920,21 @@
#define WINBOND_NEX_W25X16 0x3015
#define WINBOND_NEX_W25X32 0x3016
#define WINBOND_NEX_W25X64 0x3017
-#define WINBOND_NEX_W25Q40 0x4013
-#define WINBOND_NEX_W25Q80 0x4014
-#define WINBOND_NEX_W25Q16 0x4015
-#define WINBOND_NEX_W25Q32 0x4016
-#define WINBOND_NEX_W25Q64 0x4017
-#define WINBOND_NEX_W25Q128 0x4018
+#define WINBOND_NEX_W25Q40_V 0x4013 /* W25Q40BV; W25Q40BL (2.3-3.6V) */
+#define WINBOND_NEX_W25Q80_V 0x4014 /* W25Q80BV */
+#define WINBOND_NEX_W25Q16_V 0x4015 /* W25Q16CV; W25Q16DV */
+#define WINBOND_NEX_W25Q32_V 0x4016 /* W25Q32BV; W25Q32FV in SPI mode (default) */
+#define WINBOND_NEX_W25Q64_V 0x4017 /* W25Q64BV, W25Q64CV; W25Q64FV in SPI mode (default) */
+#define WINBOND_NEX_W25Q128_V 0x4018 /* W25Q128BV; W25Q128FV in SPI mode (default) */
+#define WINBOND_NEX_W25Q256_V 0x4019 /* W25Q256FV */
#define WINBOND_NEX_W25Q20_W 0x5012 /* W25Q20BW */
#define WINBOND_NEX_W25Q40_W 0x5013 /* W25Q40BW */
#define WINBOND_NEX_W25Q80_W 0x5014 /* W25Q80BW */
#define WINBOND_NEX_W25Q40EW 0x6013
#define WINBOND_NEX_W25Q16_W 0x6015 /* W25Q16DW */
-#define WINBOND_NEX_W25Q32DW 0x6016
-#define WINBOND_NEX_W25Q64DW 0x6017
-#define WINBOND_NEX_W25Q128FW 0x6018
-#define WINBOND_NEX_W25Q128_V 0x4018 /* W25Q128BV; W25Q128FV in SPI mode (default) */
+#define WINBOND_NEX_W25Q32_W 0x6016 /* W25Q32DW; W25Q32FV in QPI mode */
+#define WINBOND_NEX_W25Q64_W 0x6017 /* W25Q64DW; W25Q64FV in QPI mode */
+#define WINBOND_NEX_W25Q128_W 0x6018 /* (No W version known) W25Q128FV in QPI mode */
#define WINBOND_ID 0xDA /* Winbond */
#define WINBOND_W19B160BB 0x49
diff --git a/writeprotect.c b/writeprotect.c
index 051193e..3b0087a 100644
--- a/writeprotect.c
+++ b/writeprotect.c
@@ -744,26 +744,26 @@
*w25q_ranges = w25x80_ranges;
*num_entries = ARRAY_SIZE(w25x80_ranges);
break;
- case WINBOND_NEX_W25Q80:
+ case WINBOND_NEX_W25Q80_V:
*w25q_ranges = w25q80_ranges;
*num_entries = ARRAY_SIZE(w25q80_ranges);
break;
- case WINBOND_NEX_W25Q16:
+ case WINBOND_NEX_W25Q16_V:
*w25q_ranges = w25q16_ranges;
*num_entries = ARRAY_SIZE(w25q16_ranges);
break;
- case WINBOND_NEX_W25Q32:
- case WINBOND_NEX_W25Q32DW:
+ case WINBOND_NEX_W25Q32_V:
+ case WINBOND_NEX_W25Q32_W:
*w25q_ranges = w25q32_ranges;
*num_entries = ARRAY_SIZE(w25q32_ranges);
break;
- case WINBOND_NEX_W25Q64:
- case WINBOND_NEX_W25Q64DW:
+ case WINBOND_NEX_W25Q64_V:
+ case WINBOND_NEX_W25Q64_W:
*w25q_ranges = w25q64_ranges;
*num_entries = ARRAY_SIZE(w25q64_ranges);
break;
- case WINBOND_NEX_W25Q128:
- case WINBOND_NEX_W25Q128FW:
+ case WINBOND_NEX_W25Q128_V:
+ case WINBOND_NEX_W25Q128_W:
if (w25q_read_status_register_2(flash) & (1 << 6)) {
/* CMP == 1 */
*w25q_ranges = w25rq128_cmp1_ranges;
