summaryrefslogtreecommitdiff
path: root/src/drivers/spi
diff options
context:
space:
mode:
authorMike Banon <mikebdp2@gmail.com>2019-01-12 13:55:09 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-01-14 02:24:32 +0000
commit4902a802c8282708767cb104af6c9174837e7a30 (patch)
tree1fdcfd8f40bbe2d1699b125c1b1f589cdd93136e /src/drivers/spi
parent3c3351306cb1454c029822de0b308210369e9bfb (diff)
drivers/spi/macronix.c: Add the rest of >=1MB Macronix MX25 chips
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>
Diffstat (limited to 'src/drivers/spi')
-rw-r--r--src/drivers/spi/macronix.c94
1 files changed, 79 insertions, 15 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
@@ -80,44 +80,76 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
.name = "MX25L3205D",
},
{
- .idcode = 0x5e16,
+ .idcode = 0x2017,
.page_size = 256,
.pages_per_sector = 16,
.sectors_per_block = 16,
- .nr_blocks = 64,
- .name = "MX25L3235D", /* MX25L3225D/MX25L3235D/MX25L3236D/MX25L3237D */
+ .nr_blocks = 128,
+ .name = "MX25L6405D",
},
{
- .idcode = 0x2536,
+ .idcode = 0x2018,
.page_size = 256,
.pages_per_sector = 16,
.sectors_per_block = 16,
- .nr_blocks = 64,
- .name = "MX25L3239E",
+ .nr_blocks = 256,
+ .name = "MX25L12805D",
},
{
- .idcode = 0x2017,
+ .idcode = 0x2019,
.page_size = 256,
.pages_per_sector = 16,
.sectors_per_block = 16,
- .nr_blocks = 128,
- .name = "MX25L6405D",
+ .nr_blocks = 512,
+ .name = "MX25L25635F",
},
{
- .idcode = 0x2018,
+ .idcode = 0x201a,
.page_size = 256,
.pages_per_sector = 16,
.sectors_per_block = 16,
- .nr_blocks = 256,
- .name = "MX25L12805D",
+ .nr_blocks = 1024,
+ .name = "MX66L51235F",
},
{
- .idcode = 0x2618,
+ .idcode = 0x2415,
.page_size = 256,
.pages_per_sector = 16,
.sectors_per_block = 16,
- .nr_blocks = 256,
- .name = "MX25L12855E",
+ .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,
@@ -136,6 +168,38 @@ static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
.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,
.pages_per_sector = 16,