[coreboot-gerrit] Change in ...coreboot[master]: drivers/spi/gigadevice.c: Add the rest of >=1MB Gigadevice GD25 chips

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/30882 )

Change subject: drivers/spi/gigadevice.c: Add the rest of >=1MB Gigadevice GD25 chips
......................................................................

drivers/spi/gigadevice.c: Add the rest of >=1MB Gigadevice GD25 chips

Required for ACPI S3 suspend support at some motherboards.
Synchronizing with flashchips.c/h flashrom source code.

Signed-off-by: Mike Banon 
Change-Id: I333c8589ddc2bece488608ff66015ca8307eae0f
Reviewed-on: https://review.coreboot.org/c/30882
Tested-by: build bot (Jenkins) 
Reviewed-by: Kyösti Mälkki 
---
M src/drivers/spi/gigadevice.c
1 file changed, 59 insertions(+), 11 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved

diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c
index 2d7544c..ff1ce2f 100644
--- a/src/drivers/spi/gigadevice.c
+++ b/src/drivers/spi/gigadevice.c
@@ -51,12 +51,20 @@

static const struct gigadevice_spi_flash_params gigadevice_spi_flash_table[] = {
    {
+		.id			= 0x3114,
+		.l2_page_size		= 8,
+		.pages_per_sector	= 16,
+		.sectors_per_block	= 16,
+		.nr_blocks		= 16,
+		.name			= "GD25T80",
+	},
+	{
    	.id			= 0x4014,
    	.l2_page_size		= 8,
    	.pages_per_sector	= 16,
    	.sectors_per_block	= 16,
    	.nr_blocks		= 16,
-		.name			= "GD25Q80",
+		.name			= "GD25Q80(B)",
    },
    {
    	.id			= 0x4015,
@@ -75,6 +83,54 @@
    	.name			= "GD25Q32(B)",
    },
    {
+		.id			= 0x4017,
+		.l2_page_size		= 8,
+		.pages_per_sector	= 16,
+		.sectors_per_block	= 16,
+		.nr_blocks		= 128,
+		.name			= "GD25Q64(B)/GD25B64C",
+	},
+	{
+		.id			= 0x4018,
+		.l2_page_size		= 8,
+		.pages_per_sector	= 16,
+		.sectors_per_block	= 16,
+		.nr_blocks		= 256,
+		.name			= "GD25Q128(B)",
+	},
+	{
+		.id			= 0x4214,
+		.l2_page_size		= 8,
+		.pages_per_sector	= 16,
+		.sectors_per_block	= 16,
+		.nr_blocks		= 16,
+		.name			= "GD25VQ80C",
+	},
+	{
+		.id			= 0x4215,
+		.l2_page_size		= 8,
+		.pages_per_sector	= 16,
+		.sectors_per_block	= 16,
+		.nr_blocks		= 32,
+		.name			= "GD25VQ16C",
+	},
+	{
+		.id			= 0x6014,
+		.l2_page_size		= 8,
+		.pages_per_sector	= 16,
+		.sectors_per_block	= 16,
+		.nr_blocks		= 16,
+		.name			= "GD25LQ80",
+	},
+	{
+		.id			= 0x6015,
+		.l2_page_size		= 8,
+		.pages_per_sector	= 16,
+		.sectors_per_block	= 16,
+		.nr_blocks		= 32,
+		.name			= "GD25LQ16",
+	},
+	{
    	.id			= 0x6016,
    	.l2_page_size		= 8,
    	.pages_per_sector	= 16,
@@ -83,14 +139,6 @@
    	.name			= "GD25LQ32",
    },
    {
-		.id			= 0x4017,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
-		.nr_blocks		= 128,
-		.name			= "GD25Q64B/GD25B64C",
-	},
-	{
    	.id			= 0x6017,
    	.l2_page_size		= 8,
    	.pages_per_sector	= 16,
@@ -99,12 +147,12 @@
    	.name			= "GD25LQ64C/GD25LB64C",
    },
    {
-		.id			= 0x4018,
+		.id			= 0x6018,
    	.l2_page_size		= 8,
    	.pages_per_sector	= 16,
    	.sectors_per_block	= 16,
    	.nr_blocks		= 256,
-		.name			= "GD25Q128(B)",
+		.name			= "GD25LQ128",
    },
 };