aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/chips
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-04-26 22:19:33 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-05-13 21:27:46 -0400
commit087acaf1c6812d0ff4d4cb79c6f5a0e4e63815b3 (patch)
tree2e6a8cfbb82ea3c1fa64c9f2b850b96e0a0b84b1 /drivers/mtd/chips
parentb60b08b02ca8d9575985ae6711bd656dd67e9039 (diff)
mtd: chips: add SST39WF160x NOR-flashes
Due to a broken CFI, they have to be added to jedec_probe. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/chips')
-rw-r--r--drivers/mtd/chips/jedec_probe.c30
1 files changed, 30 insertions, 0 deletions
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index b2e6f2f79de..d72a5fb2d04 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -148,6 +148,8 @@
148#define SST39LF160 0x2782 148#define SST39LF160 0x2782
149#define SST39VF1601 0x234b 149#define SST39VF1601 0x234b
150#define SST39VF3201 0x235b 150#define SST39VF3201 0x235b
151#define SST39WF1601 0x274b
152#define SST39WF1602 0x274a
151#define SST39LF512 0x00D4 153#define SST39LF512 0x00D4
152#define SST39LF010 0x00D5 154#define SST39LF010 0x00D5
153#define SST39LF020 0x00D6 155#define SST39LF020 0x00D6
@@ -1511,6 +1513,34 @@ static const struct amd_flash_info jedec_table[] = {
1511 ERASEINFO(0x1000,256) 1513 ERASEINFO(0x1000,256)
1512 } 1514 }
1513 }, { 1515 }, {
1516 /* CFI is broken: reports AMD_STD, but needs custom uaddr */
1517 .mfr_id = CFI_MFR_SST,
1518 .dev_id = SST39WF1601,
1519 .name = "SST 39WF1601",
1520 .devtypes = CFI_DEVICETYPE_X16,
1521 .uaddr = MTD_UADDR_0xAAAA_0x5555,
1522 .dev_size = SIZE_2MiB,
1523 .cmd_set = P_ID_AMD_STD,
1524 .nr_regions = 2,
1525 .regions = {
1526 ERASEINFO(0x1000,256),
1527 ERASEINFO(0x1000,256)
1528 }
1529 }, {
1530 /* CFI is broken: reports AMD_STD, but needs custom uaddr */
1531 .mfr_id = CFI_MFR_SST,
1532 .dev_id = SST39WF1602,
1533 .name = "SST 39WF1602",
1534 .devtypes = CFI_DEVICETYPE_X16,
1535 .uaddr = MTD_UADDR_0xAAAA_0x5555,
1536 .dev_size = SIZE_2MiB,
1537 .cmd_set = P_ID_AMD_STD,
1538 .nr_regions = 2,
1539 .regions = {
1540 ERASEINFO(0x1000,256),
1541 ERASEINFO(0x1000,256)
1542 }
1543 }, {
1514 .mfr_id = CFI_MFR_SST, /* should be CFI */ 1544 .mfr_id = CFI_MFR_SST, /* should be CFI */
1515 .dev_id = SST39VF3201, 1545 .dev_id = SST39VF3201,
1516 .name = "SST 39VF3201", 1546 .name = "SST 39VF3201",