From 32961be12d6213bdbccc28afe887359a1e0b5d51 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Thu, 23 Jul 2009 01:40:20 +0000 Subject: Add support for ST M25P05/M25P10 chips that only respond to RES and not RDID Unfortunately, either the datasheets are wrong or both chips have exactly the same ID. Corresponding to flashrom svn r662. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Reinauer --- flashchips.c | 38 ++++++++++++++++++++++++++++++++++++++ flashchips.h | 2 ++ 2 files changed, 40 insertions(+) diff --git a/flashchips.c b/flashchips.c index d3c1831..fa5fdff 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2249,6 +2249,27 @@ struct flashchip flashchips[] = { .read = spi_chip_read, }, + /* The ST M25P05 is a bit of a problem. It has the same ID as the + * ST M25P05-A in RES mode, but supports only 128 byte writes instead + * of 256 byte writes. We rely heavily on the fact that probe_spi_res + * only is successful if RDID does not work. + */ + { + .vendor = "ST", + .name = "M25P05.RES", + .bustype = CHIP_BUSTYPE_SPI, + .manufacture_id = ST_ID, + .model_id = ST_M25P05_RES, + .total_size = 64, + .page_size = 256, + .tested = TEST_UNTESTED, + .probe = probe_spi_res, + .probe_timing = TIMING_ZERO, + .erase = spi_chip_erase_c7, + .write = spi_chip_write_1, /* 128 */ + .read = spi_chip_read, + }, + { .vendor = "ST", .name = "M25P10-A", @@ -2265,6 +2286,23 @@ struct flashchip flashchips[] = { .read = spi_chip_read, }, + /* The ST M25P10 has the same problem as the M25P05. */ + { + .vendor = "ST", + .name = "M25P10.RES", + .bustype = CHIP_BUSTYPE_SPI, + .manufacture_id = ST_ID, + .model_id = ST_M25P10_RES, + .total_size = 128, + .page_size = 256, + .tested = TEST_UNTESTED, + .probe = probe_spi_res, + .probe_timing = TIMING_ZERO, + .erase = spi_chip_erase_c7, + .write = spi_chip_write_1, /* 128 */ + .read = spi_chip_read, + }, + { .vendor = "ST", .name = "M25P20", diff --git a/flashchips.h b/flashchips.h index 0b58e50..0cd6895 100644 --- a/flashchips.h +++ b/flashchips.h @@ -322,7 +322,9 @@ */ #define ST_ID 0x20 /* ST / SGS/Thomson */ #define ST_M25P05A 0x2010 +#define ST_M25P05_RES 0x10 /* Same code as M25P10. */ #define ST_M25P10A 0x2011 +#define ST_M25P10_RES 0x10 /* Same code as M25P05. */ #define ST_M25P20 0x2012 #define ST_M25P40 0x2013 #define ST_M25P40_RES 0x12 -- cgit v1.1