From 4902a802c8282708767cb104af6c9174837e7a30 Mon Sep 17 00:00:00 2001
From: Mike Banon <mikebdp2@gmail.com>
Date: Sat, 12 Jan 2019 13:55:09 +0300
Subject: [PATCH] drivers/spi/macronix.c: Add the rest of >=1MB Macronix MX25
 chips
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Mike Banon <mikebdp2@gmail.com>
Change-Id: I4508a65a5bdcbf58aadf452de5e896fc3c5b1bc3
Reviewed-on: https://review.coreboot.org/c/30877
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
 src/drivers/spi/macronix.c | 102 ++++++++++++++++++++++++++++++-------
 1 file changed, 83 insertions(+), 19 deletions(-)

diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c
index 7ed70c029e..d9f0044380 100644
--- a/src/drivers/spi/macronix.c
+++ b/src/drivers/spi/macronix.c
@@ -79,22 +79,6 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
 		.nr_blocks = 64,
 		.name = "MX25L3205D",
 	},
-	{
-		.idcode = 0x5e16,
-		.page_size = 256,
-		.pages_per_sector = 16,
-		.sectors_per_block = 16,
-		.nr_blocks = 64,
-		.name = "MX25L3235D", /* MX25L3225D/MX25L3235D/MX25L3236D/MX25L3237D */
-	},
-	{
-		.idcode = 0x2536,
-		.page_size = 256,
-		.pages_per_sector = 16,
-		.sectors_per_block = 16,
-		.nr_blocks = 64,
-		.name = "MX25L3239E",
-	},
 	{
 		.idcode = 0x2017,
 		.page_size = 256,
@@ -112,12 +96,60 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
 		.name = "MX25L12805D",
 	},
 	{
-		.idcode = 0x2618,
+		.idcode = 0x2019,
 		.page_size = 256,
 		.pages_per_sector = 16,
 		.sectors_per_block = 16,
-		.nr_blocks = 256,
-		.name = "MX25L12855E",
+		.nr_blocks = 512,
+		.name = "MX25L25635F",
+	},
+	{
+		.idcode = 0x201a,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 1024,
+		.name = "MX66L51235F",
+	},
+	{
+		.idcode = 0x2415,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 32,
+		.name = "MX25L1635D",
+	},
+	{
+		.idcode = 0x2515,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 32,
+		.name = "MX25L1635E",
+	},
+	{
+		.idcode = 0x2534,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 16,
+		.name = "MX25U8032E",
+	},
+	{
+		.idcode = 0x2535,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 32,
+		.name = "MX25U1635E",
+	},
+	{
+		.idcode = 0x2536,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 64,
+		.name = "MX25U3235E",
 	},
 	{
 		.idcode = 0x2537,
@@ -135,6 +167,38 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
 		.nr_blocks = 256,
 		.name = "MX25U12835F",
 	},
+	{
+		.idcode = 0x2539,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 512,
+		.name = "MX25U25635F",
+	},
+	{
+		.idcode = 0x253a,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 1024,
+		.name = "MX25U51245G",
+	},
+	{
+		.idcode = 0x2618,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 256,
+		.name = "MX25L12855E",
+	},
+	{
+		.idcode = 0x5e16,
+		.page_size = 256,
+		.pages_per_sector = 16,
+		.sectors_per_block = 16,
+		.nr_blocks = 64,
+		.name = "MX25L3235D", /* MX25L3225D/MX25L3236D/MX25L3237D */
+	},
 	{
 		.idcode = 0x9517,
 		.page_size = 256,