Change in flashrom[master]: flashchips: Add ISSI IS25WP064 and IS25WP032

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/28884

Change subject: flashchips: Add ISSI IS25WP064 and IS25WP032
......................................................................

flashchips: Add ISSI IS25WP064 and IS25WP032

The IS25WP064 was tested successfully by Simon Buhrow as reported on
2018-9-4. While we are at it, also add the 32Mbit version which shares
the datasheet (as does the already supported 128Mbit version).

Change-Id: Ie0887b4ae6e6465118a5dc2e20b784f783d161b8
Signed-off-by: Nico Huber 
---
M flashchips.c
M flashchips.h
2 files changed, 88 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/84/28884/1

diff --git a/flashchips.c b/flashchips.c
index 57ff7b9..388deba 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -7296,6 +7296,90 @@

{
    	.vendor		= "ISSI",
+		.name		= "IS25WP032",
+		.bustype	= BUS_SPI,
+		.manufacture_id = ISSI_ID_SPI,
+		.model_id	= ISSI_IS25WP032,
+		.total_size	= 4096,
+		.page_size	= 256,
+		/* OTP: 1024B total; read 0x48; write 0x42 */
+		/* QPI enable 0x35, disable 0xF5 */
+		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+		.tested		= TEST_UNTESTED,
+		.probe		= probe_spi_rdid,
+		.probe_timing	= TIMING_ZERO,
+		.block_erasers	=
+		{
+			{
+				.eraseblocks = { {4 * 1024, 1024} },
+				.block_erase = spi_block_erase_20,
+			}, {
+				.eraseblocks = { {4 * 1024, 1024} },
+				.block_erase = spi_block_erase_d7,
+			}, {
+				.eraseblocks = { {32 * 1024, 128} },
+				.block_erase = spi_block_erase_52,
+			}, {
+				.eraseblocks = { {64 * 1024, 64} },
+				.block_erase = spi_block_erase_d8,
+			}, {
+				.eraseblocks = { {4 * 1024 * 1024, 1} },
+				.block_erase = spi_block_erase_60,
+			}, {
+				.eraseblocks = { {4 * 1024 * 1024, 1} },
+				.block_erase = spi_block_erase_c7,
+			}
+		},
+		.unlock		= spi_disable_blockprotect,
+		.write		= spi_chip_write_256,
+		.read		= spi_chip_read,
+		.voltage	= {1650, 1950},
+	},
+
+	{
+		.vendor		= "ISSI",
+		.name		= "IS25WP064",
+		.bustype	= BUS_SPI,
+		.manufacture_id = ISSI_ID_SPI,
+		.model_id	= ISSI_IS25WP064,
+		.total_size	= 8192,
+		.page_size	= 256,
+		/* OTP: 1024B total; read 0x48; write 0x42 */
+		/* QPI enable 0x35, disable 0xF5 */
+		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+		.tested		= TEST_OK_PREW,
+		.probe		= probe_spi_rdid,
+		.probe_timing	= TIMING_ZERO,
+		.block_erasers	=
+		{
+			{
+				.eraseblocks = { {4 * 1024, 2048} },
+				.block_erase = spi_block_erase_20,
+			}, {
+				.eraseblocks = { {4 * 1024, 2048} },
+				.block_erase = spi_block_erase_d7,
+			}, {
+				.eraseblocks = { {32 * 1024, 256} },
+				.block_erase = spi_block_erase_52,
+			}, {
+				.eraseblocks = { {64 * 1024, 128} },
+				.block_erase = spi_block_erase_d8,
+			}, {
+				.eraseblocks = { {8 * 1024 * 1024, 1} },
+				.block_erase = spi_block_erase_60,
+			}, {
+				.eraseblocks = { {8 * 1024 * 1024, 1} },
+				.block_erase = spi_block_erase_c7,
+			}
+		},
+		.unlock		= spi_disable_blockprotect,
+		.write		= spi_chip_write_256,
+		.read		= spi_chip_read,
+		.voltage	= {1650, 1950},
+	},
+
+	{
+		.vendor		= "ISSI",
    	.name		= "IS25WP128",
    	.bustype	= BUS_SPI,
    	.manufacture_id	= ISSI_ID_SPI,
@@ -7303,7 +7387,8 @@
    	.total_size	= 16384,
    	.page_size	= 256,
    	/* OTP: 1024B total; read 0x48; write 0x42 */
-		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP,
+		/* QPI enable 0x35, disable 0xF5 */
+		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
    	.tested		= TEST_OK_PREW,
    	.probe		= probe_spi_rdid,
    	.probe_timing	= TIMING_ZERO,
diff --git a/flashchips.h b/flashchips.h
index ecd8d7a..ee8c7d0 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -454,6 +454,8 @@
 #define ISSI_ID			0xD5	/* ISSI Integrated Silicon Solutions, see also PMC. */
 #define ISSI_ID_SPI		0x9D	/* ISSI ID used for SPI flash, see also PMC_ID_NOPREFIX */
 #define ISSI_IS25LP128		0x6018
+#define ISSI_IS25WP032		0x7016
+#define ISSI_IS25WP064		0x7017
 #define ISSI_IS25WP128		0x7018
 #define ISSI_PMC_IS29GL032B	0xF9
 #define ISSI_PMC_IS29GL032T	0xF6