minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-14 06:26:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sf' of git://git.denx.de/u-boot-blackfin

Browse Source 
* 'sf' of git://git.denx.de/u-boot-blackfin:
  sf: spansion: Add support for S25FL256S
  sf: winbond: fix page_size
  sf: stmicro: add support for N25Q128A
  sf: stmicro: add support N25Q128 parts
  sf: stmicro: support JEDEC standard two-byte signature
  sf: winbond: add W25Q32
  cmd_spi: remove superfluous semicolon

Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
Wolfgang Denk 2012-09-01 12:22:31 +02:00
commit c51261e8db
4 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_spi.c
View File

@ -89,7 +89,7 @@ int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
cs = bus; cs = bus;
bus = CONFIG_DEFAULT_SPI_BUS; bus = CONFIG_DEFAULT_SPI_BUS;
} }
if (*cp == '.'); if (*cp == '.')
mode = simple_strtoul(cp+1, NULL, 10); mode = simple_strtoul(cp+1, NULL, 10);
} }
if (argc >= 3) if (argc >= 3)

7
drivers/mtd/spi/spansion.c
View File

@ -96,6 +96,13 @@ static const struct spansion_spi_flash_params spansion_spi_flash_table[] = {
.nr_sectors = 256, .nr_sectors = 256,
.name = "S25FL129P_64K", .name = "S25FL129P_64K",
}, },
{
.idcode1 = 0x2019,
.idcode2 = 0x4d01,
.pages_per_sector = 256,
.nr_sectors = 512,
.name = "S25FL256S",
},
}; };
struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode) struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode)

39
drivers/mtd/spi/stmicro.c
View File

@ -37,7 +37,7 @@
#define CMD_M25PXX_RES 0xab /* Release from DP, and Read Signature */ #define CMD_M25PXX_RES 0xab /* Release from DP, and Read Signature */
struct stmicro_spi_flash_params { struct stmicro_spi_flash_params {
u8 idcode1; u16 id;
u16 pages_per_sector; u16 pages_per_sector;
u16 nr_sectors; u16 nr_sectors;
const char *name; const char *name;
@ -45,55 +45,67 @@ struct stmicro_spi_flash_params {
static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = { static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
{ {
.idcode1 = 0x11, .id = 0x2011,
.pages_per_sector = 128, .pages_per_sector = 128,
.nr_sectors = 4, .nr_sectors = 4,
.name = "M25P10", .name = "M25P10",
}, },
{ {
.idcode1 = 0x15, .id = 0x2015,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 32, .nr_sectors = 32,
.name = "M25P16", .name = "M25P16",
}, },
{ {
.idcode1 = 0x12, .id = 0x2012,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 4, .nr_sectors = 4,
.name = "M25P20", .name = "M25P20",
}, },
{ {
.idcode1 = 0x16, .id = 0x2016,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 64, .nr_sectors = 64,
.name = "M25P32", .name = "M25P32",
}, },
{ {
.idcode1 = 0x13, .id = 0x2013,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 8, .nr_sectors = 8,
.name = "M25P40", .name = "M25P40",
}, },
{ {
.idcode1 = 0x17, .id = 0x2017,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 128, .nr_sectors = 128,
.name = "M25P64", .name = "M25P64",
}, },
{ {
.idcode1 = 0x14, .id = 0x2014,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 16, .nr_sectors = 16,
.name = "M25P80", .name = "M25P80",
}, },
{ {
.idcode1 = 0x18, .id = 0x2018,
.pages_per_sector = 1024, .pages_per_sector = 1024,
.nr_sectors = 64, .nr_sectors = 64,
.name = "M25P128", .name = "M25P128",
}, },
{ {
.idcode1 = 0x19, .id = 0xba18,
.pages_per_sector = 256,
.nr_sectors = 256,
.name = "N25Q128",
},
{
.id = 0xbb18,
.pages_per_sector = 256,
.nr_sectors = 256,
.name = "N25Q128A",
},
{
.id = 0xba19,
.pages_per_sector = 256, .pages_per_sector = 256,
.nr_sectors = 512, .nr_sectors = 512,
.name = "N25Q256", .name = "N25Q256",
@ -105,6 +117,7 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
const struct stmicro_spi_flash_params *params; const struct stmicro_spi_flash_params *params;
struct spi_flash *flash; struct spi_flash *flash;
unsigned int i; unsigned int i;
u16 id;
if (idcode[0] == 0xff) { if (idcode[0] == 0xff) {
i = spi_flash_cmd(spi, CMD_M25PXX_RES, i = spi_flash_cmd(spi, CMD_M25PXX_RES,
@ -119,15 +132,17 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
return NULL; return NULL;
} }
id = ((idcode[1] << 8) | idcode[2]);
for (i = 0; i < ARRAY_SIZE(stmicro_spi_flash_table); i++) { for (i = 0; i < ARRAY_SIZE(stmicro_spi_flash_table); i++) {
params = &stmicro_spi_flash_table[i]; params = &stmicro_spi_flash_table[i];
if (params->idcode1 == idcode[2]) { if (params->id == id) {
break; break;
} }
} }
if (i == ARRAY_SIZE(stmicro_spi_flash_table)) { if (i == ARRAY_SIZE(stmicro_spi_flash_table)) {
debug("SF: Unsupported STMicro ID %02x\n", idcode[1]); debug("SF: Unsupported STMicro ID %04x\n", id);
return NULL; return NULL;
} }

7
drivers/mtd/spi/winbond.c
View File

@ -62,6 +62,11 @@ static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {
.nr_blocks = 256, .nr_blocks = 256,
.name = "W25Q128", .name = "W25Q128",
}, },
{
.id = 0x5014,
.nr_blocks = 128,
.name = "W25Q80",
},
}; };
struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode) struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
@ -94,7 +99,7 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
flash->write = spi_flash_cmd_write_multi; flash->write = spi_flash_cmd_write_multi;
flash->erase = spi_flash_cmd_erase; flash->erase = spi_flash_cmd_erase;
flash->read = spi_flash_cmd_read_fast; flash->read = spi_flash_cmd_read_fast;
flash->page_size = 4096; flash->page_size = 256;
flash->sector_size = 4096; flash->sector_size = 4096;
flash->size = 4096 * 16 * params->nr_blocks; flash->size = 4096 * 16 * params->nr_blocks;