projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
4134122
ea7fcc5
)
Merge branch 'master' of git://git.denx.de/u-boot-spi
author
Tom Rini
<trini@ti.com>
Thu, 13 Jun 2013 19:18:35 +0000
(15:18 -0400)
committer
Tom Rini
<trini@ti.com>
Thu, 13 Jun 2013 19:18:35 +0000
(15:18 -0400)
1
2
drivers/mtd/spi/spansion.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --combined
drivers/mtd/spi/spansion.c
index
dad30b5
,
2218e2f
..
b3ef90f
---
1
/
drivers/mtd/spi/spansion.c
---
2
/
drivers/mtd/spi/spansion.c
+++ b/
drivers/mtd/spi/spansion.c
@@@
-90,18
-90,25
+90,25
@@@
static const struct spansion_spi_flash_
.name = "S25FL032P",
},
{
+ .idcode1 = 0x0216,
+ .idcode2 = 0x4d00,
+ .pages_per_sector = 256,
+ .nr_sectors = 128,
+ .name = "S25FL064P",
+ },
+ {
.idcode1 = 0x2018,
.idcode2 = 0x4d01,
.pages_per_sector = 256,
.nr_sectors = 256,
- .name = "S25FL129P_64K",
+ .name = "S25FL129P_64K
/S25FL128S
",
},
{
.idcode1 = 0x0219,
.idcode2 = 0x4d01,
.pages_per_sector = 256,
.nr_sectors = 512,
- .name = "S25FL256S",
+ .name = "S25FL256S
_64K
",
},
};