aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/chips
diff options
context:
space:
mode:
authorGordon Farquharson <gordonfarquharson@gmail.com>2008-04-18 16:44:18 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2008-04-22 07:35:52 -0400
commit30d6a24eb8fdba2c6240bfec0eec4c8f2f058a1b (patch)
tree9e289192ee49c6c0985ad9f27051f4bc2394c1dc /drivers/mtd/chips
parentcca15841710da39490abc17f56b55703e3140955 (diff)
[MTD] [JEDEC] add support for the ST M29W400DB flash chip
Add support for the ST M29W400DB flash chip. which is used on the GLAN Tank NAS. Signed-off-by: Gordon Farquharson <gordonfarquharson@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/chips')
-rw-r--r--drivers/mtd/chips/jedec_probe.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 4be51a86a85c..8a00de506664 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -132,6 +132,8 @@
132#define M29F800AB 0x0058 132#define M29F800AB 0x0058
133#define M29W800DT 0x00D7 133#define M29W800DT 0x00D7
134#define M29W800DB 0x005B 134#define M29W800DB 0x005B
135#define M29W400DT 0x00EE
136#define M29W400DB 0x00EF
135#define M29W160DT 0x22C4 137#define M29W160DT 0x22C4
136#define M29W160DB 0x2249 138#define M29W160DB 0x2249
137#define M29W040B 0x00E3 139#define M29W040B 0x00E3
@@ -1456,6 +1458,36 @@ static const struct amd_flash_info jedec_table[] = {
1456 ERASEINFO(0x08000,1), 1458 ERASEINFO(0x08000,1),
1457 ERASEINFO(0x10000,15) 1459 ERASEINFO(0x10000,15)
1458 } 1460 }
1461 }, {
1462 .mfr_id = MANUFACTURER_ST,
1463 .dev_id = M29W400DT,
1464 .name = "ST M29W400DT",
1465 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
1466 .uaddr = MTD_UADDR_0x0AAA_0x0555,
1467 .dev_size = SIZE_512KiB,
1468 .cmd_set = P_ID_AMD_STD,
1469 .nr_regions = 4,
1470 .regions = {
1471 ERASEINFO(0x04000,7),
1472 ERASEINFO(0x02000,1),
1473 ERASEINFO(0x08000,2),
1474 ERASEINFO(0x10000,1)
1475 }
1476 }, {
1477 .mfr_id = MANUFACTURER_ST,
1478 .dev_id = M29W400DB,
1479 .name = "ST M29W400DB",
1480 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
1481 .uaddr = MTD_UADDR_0x0AAA_0x0555,
1482 .dev_size = SIZE_512KiB,
1483 .cmd_set = P_ID_AMD_STD,
1484 .nr_regions = 4,
1485 .regions = {
1486 ERASEINFO(0x04000,1),
1487 ERASEINFO(0x02000,2),
1488 ERASEINFO(0x08000,1),
1489 ERASEINFO(0x10000,7)
1490 }
1459 }, { 1491 }, {
1460 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1492 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */
1461 .dev_id = M29W160DT, 1493 .dev_id = M29W160DT,