summaryrefslogtreecommitdiff
path: root/src/drivers/spi/macronix.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/spi/macronix.c')
-rw-r--r--src/drivers/spi/macronix.c180
1 files changed, 66 insertions, 114 deletions
diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c
index 334404dee9..c7a4ce06aa 100644
--- a/src/drivers/spi/macronix.c
+++ b/src/drivers/spi/macronix.c
@@ -36,167 +36,120 @@
#define MACRONIX_SR_WIP (1 << 0) /* Write-in-Progress */
-struct macronix_spi_flash_params {
- u16 idcode;
- u16 page_size;
- u16 pages_per_sector;
- u16 sectors_per_block;
- u16 nr_blocks;
- const char *name;
-};
-
-static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
+static const struct spi_flash_part_id flash_table[] = {
{
- .idcode = 0x2014,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 16,
+ .id = 0x2014,
.name = "MX25L8005",
+ .nr_sectors_shift = 8,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2015,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 32,
+ .id = 0x2015,
.name = "MX25L1605D",
+ .nr_sectors_shift = 9,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2016,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 64,
+ .id = 0x2016,
.name = "MX25L3205D",
+ .nr_sectors_shift = 10,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2017,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 128,
+ .id = 0x2017,
.name = "MX25L6405D",
+ .nr_sectors_shift = 11,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2018,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 256,
+ .id = 0x2018,
.name = "MX25L12805D",
+ .nr_sectors_shift = 12,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2019,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 512,
+ .id = 0x2019,
.name = "MX25L25635F",
+ .nr_sectors_shift = 13,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x201a,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 1024,
+ .id = 0x201a,
.name = "MX66L51235F",
+ .nr_sectors_shift = 14,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2415,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 32,
+ .id = 0x2415,
.name = "MX25L1635D",
+ .nr_sectors_shift = 9,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2515,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 32,
+ .id = 0x2515,
.name = "MX25L1635E",
+ .nr_sectors_shift = 9,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2534,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 16,
+ .id = 0x2534,
.name = "MX25U8032E",
+ .nr_sectors_shift = 8,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2535,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 32,
+ .id = 0x2535,
.name = "MX25U1635E",
+ .nr_sectors_shift = 9,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2536,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 64,
+ .id = 0x2536,
.name = "MX25U3235E",
+ .nr_sectors_shift = 10,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2537,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 128,
+ .id = 0x2537,
.name = "MX25U6435F",
+ .nr_sectors_shift = 11,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2538,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 256,
+ .id = 0x2538,
.name = "MX25U12835F",
+ .nr_sectors_shift = 12,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2539,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 512,
+ .id = 0x2539,
.name = "MX25U25635F",
+ .nr_sectors_shift = 13,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x253a,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 1024,
+ .id = 0x253a,
.name = "MX25U51245G",
+ .nr_sectors_shift = 14,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x2618,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 256,
+ .id = 0x2618,
.name = "MX25L12855E",
+ .nr_sectors_shift = 12,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x5e16,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 64,
+ .id = 0x5e16,
.name = "MX25L3235D", /* MX25L3225D/MX25L3236D/MX25L3237D */
+ .nr_sectors_shift = 10,
+ .sector_size_kib_shift = 2,
},
{
- .idcode = 0x9517,
- .page_size = 256,
- .pages_per_sector = 16,
- .sectors_per_block = 16,
- .nr_blocks = 128,
+ .id = 0x9517,
.name = "MX25L6495F",
+ .nr_sectors_shift = 11,
+ .sector_size_kib_shift = 2,
},
};
@@ -210,27 +163,26 @@ static const struct spi_flash_ops spi_flash_ops = {
int spi_flash_probe_macronix(const struct spi_slave *spi, u8 *idcode,
struct spi_flash *flash)
{
- const struct macronix_spi_flash_params *params;
+ const struct spi_flash_part_id *params;
unsigned int i;
u16 id = idcode[2] | idcode[1] << 8;
- for (i = 0; i < ARRAY_SIZE(macronix_spi_flash_table); i++) {
- params = &macronix_spi_flash_table[i];
- if (params->idcode == id)
+ for (i = 0; i < ARRAY_SIZE(flash_table); i++) {
+ params = &flash_table[i];
+ if (params->id == id)
break;
}
- if (i == ARRAY_SIZE(macronix_spi_flash_table)) {
+ if (i == ARRAY_SIZE(flash_table)) {
printk(BIOS_WARNING, "SF: Unsupported Macronix ID %04x\n", id);
return -1;
}
memcpy(&flash->spi, spi, sizeof(*spi));
flash->name = params->name;
- flash->page_size = params->page_size;
- flash->sector_size = params->page_size * params->pages_per_sector;
- flash->size = flash->sector_size * params->sectors_per_block *
- params->nr_blocks;
+ flash->page_size = 256;
+ flash->sector_size = (1U << params->sector_size_kib_shift) * KiB;
+ flash->size = flash->sector_size * params->nr_sectors_shift;
flash->erase_cmd = CMD_MX25XX_SE;
flash->status_cmd = CMD_MX25XX_RDSR;
flash->pp_cmd = CMD_MX25XX_PP;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 14:12:09 +0000