aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/chips/jedec_probe.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 10:25:43 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 10:25:43 -0400
commit05ec7dd8dd5aa42c22a49682e4a51cadd4166b7e (patch)
tree6370b43c0d8f324aa7421bbb5a647aa04ab5d747 /drivers/mtd/chips/jedec_probe.c
parentc316ba3b518bc35ce5aef5421135220389f4eb98 (diff)
parent8046112818b70329e930b1d4557ef0876c1ad2bb (diff)
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (154 commits) mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value mtd: update gfp/slab.h includes jffs2: Stop triggering block erases from jffs2_write_super() jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger() jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held jffs2: Wake GC thread when there are blocks to be erased jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks() mtd: mtdchar: Do not corrupt backing device of device node inode mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages drivers/mtd: Use kmemdup mtd: cfi_cmdset_0002: Fix argument order in bootloc warning mtd: nand: add Toshiba TC58NVG0 device ID pcmciamtd: add another ID pcmciamtd: coding style cleanups pcmciamtd: fixing obvious errors mtd: chips: add SST39WF160x NOR-flashes ... Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c
Diffstat (limited to 'drivers/mtd/chips/jedec_probe.c')
-rw-r--r--drivers/mtd/chips/jedec_probe.c288
1 files changed, 150 insertions, 138 deletions
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 8db1148dfa47..d72a5fb2d041 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -22,24 +22,6 @@
22#include <linux/mtd/cfi.h> 22#include <linux/mtd/cfi.h>
23#include <linux/mtd/gen_probe.h> 23#include <linux/mtd/gen_probe.h>
24 24
25/* Manufacturers */
26#define MANUFACTURER_AMD 0x0001
27#define MANUFACTURER_ATMEL 0x001f
28#define MANUFACTURER_EON 0x001c
29#define MANUFACTURER_FUJITSU 0x0004
30#define MANUFACTURER_HYUNDAI 0x00AD
31#define MANUFACTURER_INTEL 0x0089
32#define MANUFACTURER_MACRONIX 0x00C2
33#define MANUFACTURER_NEC 0x0010
34#define MANUFACTURER_PMC 0x009D
35#define MANUFACTURER_SHARP 0x00b0
36#define MANUFACTURER_SST 0x00BF
37#define MANUFACTURER_ST 0x0020
38#define MANUFACTURER_TOSHIBA 0x0098
39#define MANUFACTURER_WINBOND 0x00da
40#define CONTINUATION_CODE 0x007f
41
42
43/* AMD */ 25/* AMD */
44#define AM29DL800BB 0x22CB 26#define AM29DL800BB 0x22CB
45#define AM29DL800BT 0x224A 27#define AM29DL800BT 0x224A
@@ -166,6 +148,8 @@
166#define SST39LF160 0x2782 148#define SST39LF160 0x2782
167#define SST39VF1601 0x234b 149#define SST39VF1601 0x234b
168#define SST39VF3201 0x235b 150#define SST39VF3201 0x235b
151#define SST39WF1601 0x274b
152#define SST39WF1602 0x274a
169#define SST39LF512 0x00D4 153#define SST39LF512 0x00D4
170#define SST39LF010 0x00D5 154#define SST39LF010 0x00D5
171#define SST39LF020 0x00D6 155#define SST39LF020 0x00D6
@@ -309,7 +293,7 @@ struct amd_flash_info {
309 */ 293 */
310static const struct amd_flash_info jedec_table[] = { 294static const struct amd_flash_info jedec_table[] = {
311 { 295 {
312 .mfr_id = MANUFACTURER_AMD, 296 .mfr_id = CFI_MFR_AMD,
313 .dev_id = AM29F032B, 297 .dev_id = AM29F032B,
314 .name = "AMD AM29F032B", 298 .name = "AMD AM29F032B",
315 .uaddr = MTD_UADDR_0x0555_0x02AA, 299 .uaddr = MTD_UADDR_0x0555_0x02AA,
@@ -321,7 +305,7 @@ static const struct amd_flash_info jedec_table[] = {
321 ERASEINFO(0x10000,64) 305 ERASEINFO(0x10000,64)
322 } 306 }
323 }, { 307 }, {
324 .mfr_id = MANUFACTURER_AMD, 308 .mfr_id = CFI_MFR_AMD,
325 .dev_id = AM29LV160DT, 309 .dev_id = AM29LV160DT,
326 .name = "AMD AM29LV160DT", 310 .name = "AMD AM29LV160DT",
327 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 311 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -336,7 +320,7 @@ static const struct amd_flash_info jedec_table[] = {
336 ERASEINFO(0x04000,1) 320 ERASEINFO(0x04000,1)
337 } 321 }
338 }, { 322 }, {
339 .mfr_id = MANUFACTURER_AMD, 323 .mfr_id = CFI_MFR_AMD,
340 .dev_id = AM29LV160DB, 324 .dev_id = AM29LV160DB,
341 .name = "AMD AM29LV160DB", 325 .name = "AMD AM29LV160DB",
342 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 326 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -351,7 +335,7 @@ static const struct amd_flash_info jedec_table[] = {
351 ERASEINFO(0x10000,31) 335 ERASEINFO(0x10000,31)
352 } 336 }
353 }, { 337 }, {
354 .mfr_id = MANUFACTURER_AMD, 338 .mfr_id = CFI_MFR_AMD,
355 .dev_id = AM29LV400BB, 339 .dev_id = AM29LV400BB,
356 .name = "AMD AM29LV400BB", 340 .name = "AMD AM29LV400BB",
357 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 341 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -366,7 +350,7 @@ static const struct amd_flash_info jedec_table[] = {
366 ERASEINFO(0x10000,7) 350 ERASEINFO(0x10000,7)
367 } 351 }
368 }, { 352 }, {
369 .mfr_id = MANUFACTURER_AMD, 353 .mfr_id = CFI_MFR_AMD,
370 .dev_id = AM29LV400BT, 354 .dev_id = AM29LV400BT,
371 .name = "AMD AM29LV400BT", 355 .name = "AMD AM29LV400BT",
372 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 356 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -381,7 +365,7 @@ static const struct amd_flash_info jedec_table[] = {
381 ERASEINFO(0x04000,1) 365 ERASEINFO(0x04000,1)
382 } 366 }
383 }, { 367 }, {
384 .mfr_id = MANUFACTURER_AMD, 368 .mfr_id = CFI_MFR_AMD,
385 .dev_id = AM29LV800BB, 369 .dev_id = AM29LV800BB,
386 .name = "AMD AM29LV800BB", 370 .name = "AMD AM29LV800BB",
387 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 371 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -397,7 +381,7 @@ static const struct amd_flash_info jedec_table[] = {
397 } 381 }
398 }, { 382 }, {
399/* add DL */ 383/* add DL */
400 .mfr_id = MANUFACTURER_AMD, 384 .mfr_id = CFI_MFR_AMD,
401 .dev_id = AM29DL800BB, 385 .dev_id = AM29DL800BB,
402 .name = "AMD AM29DL800BB", 386 .name = "AMD AM29DL800BB",
403 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 387 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -414,7 +398,7 @@ static const struct amd_flash_info jedec_table[] = {
414 ERASEINFO(0x10000,14) 398 ERASEINFO(0x10000,14)
415 } 399 }
416 }, { 400 }, {
417 .mfr_id = MANUFACTURER_AMD, 401 .mfr_id = CFI_MFR_AMD,
418 .dev_id = AM29DL800BT, 402 .dev_id = AM29DL800BT,
419 .name = "AMD AM29DL800BT", 403 .name = "AMD AM29DL800BT",
420 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 404 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -431,7 +415,7 @@ static const struct amd_flash_info jedec_table[] = {
431 ERASEINFO(0x04000,1) 415 ERASEINFO(0x04000,1)
432 } 416 }
433 }, { 417 }, {
434 .mfr_id = MANUFACTURER_AMD, 418 .mfr_id = CFI_MFR_AMD,
435 .dev_id = AM29F800BB, 419 .dev_id = AM29F800BB,
436 .name = "AMD AM29F800BB", 420 .name = "AMD AM29F800BB",
437 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 421 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -446,7 +430,7 @@ static const struct amd_flash_info jedec_table[] = {
446 ERASEINFO(0x10000,15), 430 ERASEINFO(0x10000,15),
447 } 431 }
448 }, { 432 }, {
449 .mfr_id = MANUFACTURER_AMD, 433 .mfr_id = CFI_MFR_AMD,
450 .dev_id = AM29LV800BT, 434 .dev_id = AM29LV800BT,
451 .name = "AMD AM29LV800BT", 435 .name = "AMD AM29LV800BT",
452 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 436 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -461,7 +445,7 @@ static const struct amd_flash_info jedec_table[] = {
461 ERASEINFO(0x04000,1) 445 ERASEINFO(0x04000,1)
462 } 446 }
463 }, { 447 }, {
464 .mfr_id = MANUFACTURER_AMD, 448 .mfr_id = CFI_MFR_AMD,
465 .dev_id = AM29F800BT, 449 .dev_id = AM29F800BT,
466 .name = "AMD AM29F800BT", 450 .name = "AMD AM29F800BT",
467 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 451 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -476,7 +460,7 @@ static const struct amd_flash_info jedec_table[] = {
476 ERASEINFO(0x04000,1) 460 ERASEINFO(0x04000,1)
477 } 461 }
478 }, { 462 }, {
479 .mfr_id = MANUFACTURER_AMD, 463 .mfr_id = CFI_MFR_AMD,
480 .dev_id = AM29F017D, 464 .dev_id = AM29F017D,
481 .name = "AMD AM29F017D", 465 .name = "AMD AM29F017D",
482 .devtypes = CFI_DEVICETYPE_X8, 466 .devtypes = CFI_DEVICETYPE_X8,
@@ -488,7 +472,7 @@ static const struct amd_flash_info jedec_table[] = {
488 ERASEINFO(0x10000,32), 472 ERASEINFO(0x10000,32),
489 } 473 }
490 }, { 474 }, {
491 .mfr_id = MANUFACTURER_AMD, 475 .mfr_id = CFI_MFR_AMD,
492 .dev_id = AM29F016D, 476 .dev_id = AM29F016D,
493 .name = "AMD AM29F016D", 477 .name = "AMD AM29F016D",
494 .devtypes = CFI_DEVICETYPE_X8, 478 .devtypes = CFI_DEVICETYPE_X8,
@@ -500,7 +484,7 @@ static const struct amd_flash_info jedec_table[] = {
500 ERASEINFO(0x10000,32), 484 ERASEINFO(0x10000,32),
501 } 485 }
502 }, { 486 }, {
503 .mfr_id = MANUFACTURER_AMD, 487 .mfr_id = CFI_MFR_AMD,
504 .dev_id = AM29F080, 488 .dev_id = AM29F080,
505 .name = "AMD AM29F080", 489 .name = "AMD AM29F080",
506 .devtypes = CFI_DEVICETYPE_X8, 490 .devtypes = CFI_DEVICETYPE_X8,
@@ -512,7 +496,7 @@ static const struct amd_flash_info jedec_table[] = {
512 ERASEINFO(0x10000,16), 496 ERASEINFO(0x10000,16),
513 } 497 }
514 }, { 498 }, {
515 .mfr_id = MANUFACTURER_AMD, 499 .mfr_id = CFI_MFR_AMD,
516 .dev_id = AM29F040, 500 .dev_id = AM29F040,
517 .name = "AMD AM29F040", 501 .name = "AMD AM29F040",
518 .devtypes = CFI_DEVICETYPE_X8, 502 .devtypes = CFI_DEVICETYPE_X8,
@@ -524,7 +508,7 @@ static const struct amd_flash_info jedec_table[] = {
524 ERASEINFO(0x10000,8), 508 ERASEINFO(0x10000,8),
525 } 509 }
526 }, { 510 }, {
527 .mfr_id = MANUFACTURER_AMD, 511 .mfr_id = CFI_MFR_AMD,
528 .dev_id = AM29LV040B, 512 .dev_id = AM29LV040B,
529 .name = "AMD AM29LV040B", 513 .name = "AMD AM29LV040B",
530 .devtypes = CFI_DEVICETYPE_X8, 514 .devtypes = CFI_DEVICETYPE_X8,
@@ -536,7 +520,7 @@ static const struct amd_flash_info jedec_table[] = {
536 ERASEINFO(0x10000,8), 520 ERASEINFO(0x10000,8),
537 } 521 }
538 }, { 522 }, {
539 .mfr_id = MANUFACTURER_AMD, 523 .mfr_id = CFI_MFR_AMD,
540 .dev_id = AM29F002T, 524 .dev_id = AM29F002T,
541 .name = "AMD AM29F002T", 525 .name = "AMD AM29F002T",
542 .devtypes = CFI_DEVICETYPE_X8, 526 .devtypes = CFI_DEVICETYPE_X8,
@@ -551,7 +535,7 @@ static const struct amd_flash_info jedec_table[] = {
551 ERASEINFO(0x04000,1), 535 ERASEINFO(0x04000,1),
552 } 536 }
553 }, { 537 }, {
554 .mfr_id = MANUFACTURER_AMD, 538 .mfr_id = CFI_MFR_AMD,
555 .dev_id = AM29SL800DT, 539 .dev_id = AM29SL800DT,
556 .name = "AMD AM29SL800DT", 540 .name = "AMD AM29SL800DT",
557 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 541 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -566,7 +550,7 @@ static const struct amd_flash_info jedec_table[] = {
566 ERASEINFO(0x04000,1), 550 ERASEINFO(0x04000,1),
567 } 551 }
568 }, { 552 }, {
569 .mfr_id = MANUFACTURER_AMD, 553 .mfr_id = CFI_MFR_AMD,
570 .dev_id = AM29SL800DB, 554 .dev_id = AM29SL800DB,
571 .name = "AMD AM29SL800DB", 555 .name = "AMD AM29SL800DB",
572 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 556 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -581,7 +565,7 @@ static const struct amd_flash_info jedec_table[] = {
581 ERASEINFO(0x10000,15), 565 ERASEINFO(0x10000,15),
582 } 566 }
583 }, { 567 }, {
584 .mfr_id = MANUFACTURER_ATMEL, 568 .mfr_id = CFI_MFR_ATMEL,
585 .dev_id = AT49BV512, 569 .dev_id = AT49BV512,
586 .name = "Atmel AT49BV512", 570 .name = "Atmel AT49BV512",
587 .devtypes = CFI_DEVICETYPE_X8, 571 .devtypes = CFI_DEVICETYPE_X8,
@@ -593,7 +577,7 @@ static const struct amd_flash_info jedec_table[] = {
593 ERASEINFO(0x10000,1) 577 ERASEINFO(0x10000,1)
594 } 578 }
595 }, { 579 }, {
596 .mfr_id = MANUFACTURER_ATMEL, 580 .mfr_id = CFI_MFR_ATMEL,
597 .dev_id = AT29LV512, 581 .dev_id = AT29LV512,
598 .name = "Atmel AT29LV512", 582 .name = "Atmel AT29LV512",
599 .devtypes = CFI_DEVICETYPE_X8, 583 .devtypes = CFI_DEVICETYPE_X8,
@@ -606,7 +590,7 @@ static const struct amd_flash_info jedec_table[] = {
606 ERASEINFO(0x80,256) 590 ERASEINFO(0x80,256)
607 } 591 }
608 }, { 592 }, {
609 .mfr_id = MANUFACTURER_ATMEL, 593 .mfr_id = CFI_MFR_ATMEL,
610 .dev_id = AT49BV16X, 594 .dev_id = AT49BV16X,
611 .name = "Atmel AT49BV16X", 595 .name = "Atmel AT49BV16X",
612 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 596 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -619,7 +603,7 @@ static const struct amd_flash_info jedec_table[] = {
619 ERASEINFO(0x10000,31) 603 ERASEINFO(0x10000,31)
620 } 604 }
621 }, { 605 }, {
622 .mfr_id = MANUFACTURER_ATMEL, 606 .mfr_id = CFI_MFR_ATMEL,
623 .dev_id = AT49BV16XT, 607 .dev_id = AT49BV16XT,
624 .name = "Atmel AT49BV16XT", 608 .name = "Atmel AT49BV16XT",
625 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 609 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -632,7 +616,7 @@ static const struct amd_flash_info jedec_table[] = {
632 ERASEINFO(0x02000,8) 616 ERASEINFO(0x02000,8)
633 } 617 }
634 }, { 618 }, {
635 .mfr_id = MANUFACTURER_ATMEL, 619 .mfr_id = CFI_MFR_ATMEL,
636 .dev_id = AT49BV32X, 620 .dev_id = AT49BV32X,
637 .name = "Atmel AT49BV32X", 621 .name = "Atmel AT49BV32X",
638 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 622 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -645,7 +629,7 @@ static const struct amd_flash_info jedec_table[] = {
645 ERASEINFO(0x10000,63) 629 ERASEINFO(0x10000,63)
646 } 630 }
647 }, { 631 }, {
648 .mfr_id = MANUFACTURER_ATMEL, 632 .mfr_id = CFI_MFR_ATMEL,
649 .dev_id = AT49BV32XT, 633 .dev_id = AT49BV32XT,
650 .name = "Atmel AT49BV32XT", 634 .name = "Atmel AT49BV32XT",
651 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 635 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -658,7 +642,7 @@ static const struct amd_flash_info jedec_table[] = {
658 ERASEINFO(0x02000,8) 642 ERASEINFO(0x02000,8)
659 } 643 }
660 }, { 644 }, {
661 .mfr_id = MANUFACTURER_EON, 645 .mfr_id = CFI_MFR_EON,
662 .dev_id = EN29SL800BT, 646 .dev_id = EN29SL800BT,
663 .name = "Eon EN29SL800BT", 647 .name = "Eon EN29SL800BT",
664 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 648 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -673,7 +657,7 @@ static const struct amd_flash_info jedec_table[] = {
673 ERASEINFO(0x04000,1), 657 ERASEINFO(0x04000,1),
674 } 658 }
675 }, { 659 }, {
676 .mfr_id = MANUFACTURER_EON, 660 .mfr_id = CFI_MFR_EON,
677 .dev_id = EN29SL800BB, 661 .dev_id = EN29SL800BB,
678 .name = "Eon EN29SL800BB", 662 .name = "Eon EN29SL800BB",
679 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 663 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -688,7 +672,7 @@ static const struct amd_flash_info jedec_table[] = {
688 ERASEINFO(0x10000,15), 672 ERASEINFO(0x10000,15),
689 } 673 }
690 }, { 674 }, {
691 .mfr_id = MANUFACTURER_FUJITSU, 675 .mfr_id = CFI_MFR_FUJITSU,
692 .dev_id = MBM29F040C, 676 .dev_id = MBM29F040C,
693 .name = "Fujitsu MBM29F040C", 677 .name = "Fujitsu MBM29F040C",
694 .devtypes = CFI_DEVICETYPE_X8, 678 .devtypes = CFI_DEVICETYPE_X8,
@@ -700,7 +684,7 @@ static const struct amd_flash_info jedec_table[] = {
700 ERASEINFO(0x10000,8) 684 ERASEINFO(0x10000,8)
701 } 685 }
702 }, { 686 }, {
703 .mfr_id = MANUFACTURER_FUJITSU, 687 .mfr_id = CFI_MFR_FUJITSU,
704 .dev_id = MBM29F800BA, 688 .dev_id = MBM29F800BA,
705 .name = "Fujitsu MBM29F800BA", 689 .name = "Fujitsu MBM29F800BA",
706 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 690 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -715,7 +699,7 @@ static const struct amd_flash_info jedec_table[] = {
715 ERASEINFO(0x10000,15), 699 ERASEINFO(0x10000,15),
716 } 700 }
717 }, { 701 }, {
718 .mfr_id = MANUFACTURER_FUJITSU, 702 .mfr_id = CFI_MFR_FUJITSU,
719 .dev_id = MBM29LV650UE, 703 .dev_id = MBM29LV650UE,
720 .name = "Fujitsu MBM29LV650UE", 704 .name = "Fujitsu MBM29LV650UE",
721 .devtypes = CFI_DEVICETYPE_X8, 705 .devtypes = CFI_DEVICETYPE_X8,
@@ -727,7 +711,7 @@ static const struct amd_flash_info jedec_table[] = {
727 ERASEINFO(0x10000,128) 711 ERASEINFO(0x10000,128)
728 } 712 }
729 }, { 713 }, {
730 .mfr_id = MANUFACTURER_FUJITSU, 714 .mfr_id = CFI_MFR_FUJITSU,
731 .dev_id = MBM29LV320TE, 715 .dev_id = MBM29LV320TE,
732 .name = "Fujitsu MBM29LV320TE", 716 .name = "Fujitsu MBM29LV320TE",
733 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 717 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -740,7 +724,7 @@ static const struct amd_flash_info jedec_table[] = {
740 ERASEINFO(0x02000,8) 724 ERASEINFO(0x02000,8)
741 } 725 }
742 }, { 726 }, {
743 .mfr_id = MANUFACTURER_FUJITSU, 727 .mfr_id = CFI_MFR_FUJITSU,
744 .dev_id = MBM29LV320BE, 728 .dev_id = MBM29LV320BE,
745 .name = "Fujitsu MBM29LV320BE", 729 .name = "Fujitsu MBM29LV320BE",
746 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 730 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -753,7 +737,7 @@ static const struct amd_flash_info jedec_table[] = {
753 ERASEINFO(0x10000,63) 737 ERASEINFO(0x10000,63)
754 } 738 }
755 }, { 739 }, {
756 .mfr_id = MANUFACTURER_FUJITSU, 740 .mfr_id = CFI_MFR_FUJITSU,
757 .dev_id = MBM29LV160TE, 741 .dev_id = MBM29LV160TE,
758 .name = "Fujitsu MBM29LV160TE", 742 .name = "Fujitsu MBM29LV160TE",
759 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 743 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -768,7 +752,7 @@ static const struct amd_flash_info jedec_table[] = {
768 ERASEINFO(0x04000,1) 752 ERASEINFO(0x04000,1)
769 } 753 }
770 }, { 754 }, {
771 .mfr_id = MANUFACTURER_FUJITSU, 755 .mfr_id = CFI_MFR_FUJITSU,
772 .dev_id = MBM29LV160BE, 756 .dev_id = MBM29LV160BE,
773 .name = "Fujitsu MBM29LV160BE", 757 .name = "Fujitsu MBM29LV160BE",
774 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 758 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -783,7 +767,7 @@ static const struct amd_flash_info jedec_table[] = {
783 ERASEINFO(0x10000,31) 767 ERASEINFO(0x10000,31)
784 } 768 }
785 }, { 769 }, {
786 .mfr_id = MANUFACTURER_FUJITSU, 770 .mfr_id = CFI_MFR_FUJITSU,
787 .dev_id = MBM29LV800BA, 771 .dev_id = MBM29LV800BA,
788 .name = "Fujitsu MBM29LV800BA", 772 .name = "Fujitsu MBM29LV800BA",
789 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 773 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -798,7 +782,7 @@ static const struct amd_flash_info jedec_table[] = {
798 ERASEINFO(0x10000,15) 782 ERASEINFO(0x10000,15)
799 } 783 }
800 }, { 784 }, {
801 .mfr_id = MANUFACTURER_FUJITSU, 785 .mfr_id = CFI_MFR_FUJITSU,
802 .dev_id = MBM29LV800TA, 786 .dev_id = MBM29LV800TA,
803 .name = "Fujitsu MBM29LV800TA", 787 .name = "Fujitsu MBM29LV800TA",
804 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 788 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -813,7 +797,7 @@ static const struct amd_flash_info jedec_table[] = {
813 ERASEINFO(0x04000,1) 797 ERASEINFO(0x04000,1)
814 } 798 }
815 }, { 799 }, {
816 .mfr_id = MANUFACTURER_FUJITSU, 800 .mfr_id = CFI_MFR_FUJITSU,
817 .dev_id = MBM29LV400BC, 801 .dev_id = MBM29LV400BC,
818 .name = "Fujitsu MBM29LV400BC", 802 .name = "Fujitsu MBM29LV400BC",
819 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 803 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -828,7 +812,7 @@ static const struct amd_flash_info jedec_table[] = {
828 ERASEINFO(0x10000,7) 812 ERASEINFO(0x10000,7)
829 } 813 }
830 }, { 814 }, {
831 .mfr_id = MANUFACTURER_FUJITSU, 815 .mfr_id = CFI_MFR_FUJITSU,
832 .dev_id = MBM29LV400TC, 816 .dev_id = MBM29LV400TC,
833 .name = "Fujitsu MBM29LV400TC", 817 .name = "Fujitsu MBM29LV400TC",
834 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 818 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -843,7 +827,7 @@ static const struct amd_flash_info jedec_table[] = {
843 ERASEINFO(0x04000,1) 827 ERASEINFO(0x04000,1)
844 } 828 }
845 }, { 829 }, {
846 .mfr_id = MANUFACTURER_HYUNDAI, 830 .mfr_id = CFI_MFR_HYUNDAI,
847 .dev_id = HY29F002T, 831 .dev_id = HY29F002T,
848 .name = "Hyundai HY29F002T", 832 .name = "Hyundai HY29F002T",
849 .devtypes = CFI_DEVICETYPE_X8, 833 .devtypes = CFI_DEVICETYPE_X8,
@@ -858,7 +842,7 @@ static const struct amd_flash_info jedec_table[] = {
858 ERASEINFO(0x04000,1), 842 ERASEINFO(0x04000,1),
859 } 843 }
860 }, { 844 }, {
861 .mfr_id = MANUFACTURER_INTEL, 845 .mfr_id = CFI_MFR_INTEL,
862 .dev_id = I28F004B3B, 846 .dev_id = I28F004B3B,
863 .name = "Intel 28F004B3B", 847 .name = "Intel 28F004B3B",
864 .devtypes = CFI_DEVICETYPE_X8, 848 .devtypes = CFI_DEVICETYPE_X8,
@@ -871,7 +855,7 @@ static const struct amd_flash_info jedec_table[] = {
871 ERASEINFO(0x10000, 7), 855 ERASEINFO(0x10000, 7),
872 } 856 }
873 }, { 857 }, {
874 .mfr_id = MANUFACTURER_INTEL, 858 .mfr_id = CFI_MFR_INTEL,
875 .dev_id = I28F004B3T, 859 .dev_id = I28F004B3T,
876 .name = "Intel 28F004B3T", 860 .name = "Intel 28F004B3T",
877 .devtypes = CFI_DEVICETYPE_X8, 861 .devtypes = CFI_DEVICETYPE_X8,
@@ -884,7 +868,7 @@ static const struct amd_flash_info jedec_table[] = {
884 ERASEINFO(0x02000, 8), 868 ERASEINFO(0x02000, 8),
885 } 869 }
886 }, { 870 }, {
887 .mfr_id = MANUFACTURER_INTEL, 871 .mfr_id = CFI_MFR_INTEL,
888 .dev_id = I28F400B3B, 872 .dev_id = I28F400B3B,
889 .name = "Intel 28F400B3B", 873 .name = "Intel 28F400B3B",
890 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 874 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -897,7 +881,7 @@ static const struct amd_flash_info jedec_table[] = {
897 ERASEINFO(0x10000, 7), 881 ERASEINFO(0x10000, 7),
898 } 882 }
899 }, { 883 }, {
900 .mfr_id = MANUFACTURER_INTEL, 884 .mfr_id = CFI_MFR_INTEL,
901 .dev_id = I28F400B3T, 885 .dev_id = I28F400B3T,
902 .name = "Intel 28F400B3T", 886 .name = "Intel 28F400B3T",
903 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 887 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -910,7 +894,7 @@ static const struct amd_flash_info jedec_table[] = {
910 ERASEINFO(0x02000, 8), 894 ERASEINFO(0x02000, 8),
911 } 895 }
912 }, { 896 }, {
913 .mfr_id = MANUFACTURER_INTEL, 897 .mfr_id = CFI_MFR_INTEL,
914 .dev_id = I28F008B3B, 898 .dev_id = I28F008B3B,
915 .name = "Intel 28F008B3B", 899 .name = "Intel 28F008B3B",
916 .devtypes = CFI_DEVICETYPE_X8, 900 .devtypes = CFI_DEVICETYPE_X8,
@@ -923,7 +907,7 @@ static const struct amd_flash_info jedec_table[] = {
923 ERASEINFO(0x10000, 15), 907 ERASEINFO(0x10000, 15),
924 } 908 }
925 }, { 909 }, {
926 .mfr_id = MANUFACTURER_INTEL, 910 .mfr_id = CFI_MFR_INTEL,
927 .dev_id = I28F008B3T, 911 .dev_id = I28F008B3T,
928 .name = "Intel 28F008B3T", 912 .name = "Intel 28F008B3T",
929 .devtypes = CFI_DEVICETYPE_X8, 913 .devtypes = CFI_DEVICETYPE_X8,
@@ -936,7 +920,7 @@ static const struct amd_flash_info jedec_table[] = {
936 ERASEINFO(0x02000, 8), 920 ERASEINFO(0x02000, 8),
937 } 921 }
938 }, { 922 }, {
939 .mfr_id = MANUFACTURER_INTEL, 923 .mfr_id = CFI_MFR_INTEL,
940 .dev_id = I28F008S5, 924 .dev_id = I28F008S5,
941 .name = "Intel 28F008S5", 925 .name = "Intel 28F008S5",
942 .devtypes = CFI_DEVICETYPE_X8, 926 .devtypes = CFI_DEVICETYPE_X8,
@@ -948,7 +932,7 @@ static const struct amd_flash_info jedec_table[] = {
948 ERASEINFO(0x10000,16), 932 ERASEINFO(0x10000,16),
949 } 933 }
950 }, { 934 }, {
951 .mfr_id = MANUFACTURER_INTEL, 935 .mfr_id = CFI_MFR_INTEL,
952 .dev_id = I28F016S5, 936 .dev_id = I28F016S5,
953 .name = "Intel 28F016S5", 937 .name = "Intel 28F016S5",
954 .devtypes = CFI_DEVICETYPE_X8, 938 .devtypes = CFI_DEVICETYPE_X8,
@@ -960,7 +944,7 @@ static const struct amd_flash_info jedec_table[] = {
960 ERASEINFO(0x10000,32), 944 ERASEINFO(0x10000,32),
961 } 945 }
962 }, { 946 }, {
963 .mfr_id = MANUFACTURER_INTEL, 947 .mfr_id = CFI_MFR_INTEL,
964 .dev_id = I28F008SA, 948 .dev_id = I28F008SA,
965 .name = "Intel 28F008SA", 949 .name = "Intel 28F008SA",
966 .devtypes = CFI_DEVICETYPE_X8, 950 .devtypes = CFI_DEVICETYPE_X8,
@@ -972,7 +956,7 @@ static const struct amd_flash_info jedec_table[] = {
972 ERASEINFO(0x10000, 16), 956 ERASEINFO(0x10000, 16),
973 } 957 }
974 }, { 958 }, {
975 .mfr_id = MANUFACTURER_INTEL, 959 .mfr_id = CFI_MFR_INTEL,
976 .dev_id = I28F800B3B, 960 .dev_id = I28F800B3B,
977 .name = "Intel 28F800B3B", 961 .name = "Intel 28F800B3B",
978 .devtypes = CFI_DEVICETYPE_X16, 962 .devtypes = CFI_DEVICETYPE_X16,
@@ -985,7 +969,7 @@ static const struct amd_flash_info jedec_table[] = {
985 ERASEINFO(0x10000, 15), 969 ERASEINFO(0x10000, 15),
986 } 970 }
987 }, { 971 }, {
988 .mfr_id = MANUFACTURER_INTEL, 972 .mfr_id = CFI_MFR_INTEL,
989 .dev_id = I28F800B3T, 973 .dev_id = I28F800B3T,
990 .name = "Intel 28F800B3T", 974 .name = "Intel 28F800B3T",
991 .devtypes = CFI_DEVICETYPE_X16, 975 .devtypes = CFI_DEVICETYPE_X16,
@@ -998,7 +982,7 @@ static const struct amd_flash_info jedec_table[] = {
998 ERASEINFO(0x02000, 8), 982 ERASEINFO(0x02000, 8),
999 } 983 }
1000 }, { 984 }, {
1001 .mfr_id = MANUFACTURER_INTEL, 985 .mfr_id = CFI_MFR_INTEL,
1002 .dev_id = I28F016B3B, 986 .dev_id = I28F016B3B,
1003 .name = "Intel 28F016B3B", 987 .name = "Intel 28F016B3B",
1004 .devtypes = CFI_DEVICETYPE_X8, 988 .devtypes = CFI_DEVICETYPE_X8,
@@ -1011,7 +995,7 @@ static const struct amd_flash_info jedec_table[] = {
1011 ERASEINFO(0x10000, 31), 995 ERASEINFO(0x10000, 31),
1012 } 996 }
1013 }, { 997 }, {
1014 .mfr_id = MANUFACTURER_INTEL, 998 .mfr_id = CFI_MFR_INTEL,
1015 .dev_id = I28F016S3, 999 .dev_id = I28F016S3,
1016 .name = "Intel I28F016S3", 1000 .name = "Intel I28F016S3",
1017 .devtypes = CFI_DEVICETYPE_X8, 1001 .devtypes = CFI_DEVICETYPE_X8,
@@ -1023,7 +1007,7 @@ static const struct amd_flash_info jedec_table[] = {
1023 ERASEINFO(0x10000, 32), 1007 ERASEINFO(0x10000, 32),
1024 } 1008 }
1025 }, { 1009 }, {
1026 .mfr_id = MANUFACTURER_INTEL, 1010 .mfr_id = CFI_MFR_INTEL,
1027 .dev_id = I28F016B3T, 1011 .dev_id = I28F016B3T,
1028 .name = "Intel 28F016B3T", 1012 .name = "Intel 28F016B3T",
1029 .devtypes = CFI_DEVICETYPE_X8, 1013 .devtypes = CFI_DEVICETYPE_X8,
@@ -1036,7 +1020,7 @@ static const struct amd_flash_info jedec_table[] = {
1036 ERASEINFO(0x02000, 8), 1020 ERASEINFO(0x02000, 8),
1037 } 1021 }
1038 }, { 1022 }, {
1039 .mfr_id = MANUFACTURER_INTEL, 1023 .mfr_id = CFI_MFR_INTEL,
1040 .dev_id = I28F160B3B, 1024 .dev_id = I28F160B3B,
1041 .name = "Intel 28F160B3B", 1025 .name = "Intel 28F160B3B",
1042 .devtypes = CFI_DEVICETYPE_X16, 1026 .devtypes = CFI_DEVICETYPE_X16,
@@ -1049,7 +1033,7 @@ static const struct amd_flash_info jedec_table[] = {
1049 ERASEINFO(0x10000, 31), 1033 ERASEINFO(0x10000, 31),
1050 } 1034 }
1051 }, { 1035 }, {
1052 .mfr_id = MANUFACTURER_INTEL, 1036 .mfr_id = CFI_MFR_INTEL,
1053 .dev_id = I28F160B3T, 1037 .dev_id = I28F160B3T,
1054 .name = "Intel 28F160B3T", 1038 .name = "Intel 28F160B3T",
1055 .devtypes = CFI_DEVICETYPE_X16, 1039 .devtypes = CFI_DEVICETYPE_X16,
@@ -1062,7 +1046,7 @@ static const struct amd_flash_info jedec_table[] = {
1062 ERASEINFO(0x02000, 8), 1046 ERASEINFO(0x02000, 8),
1063 } 1047 }
1064 }, { 1048 }, {
1065 .mfr_id = MANUFACTURER_INTEL, 1049 .mfr_id = CFI_MFR_INTEL,
1066 .dev_id = I28F320B3B, 1050 .dev_id = I28F320B3B,
1067 .name = "Intel 28F320B3B", 1051 .name = "Intel 28F320B3B",
1068 .devtypes = CFI_DEVICETYPE_X16, 1052 .devtypes = CFI_DEVICETYPE_X16,
@@ -1075,7 +1059,7 @@ static const struct amd_flash_info jedec_table[] = {
1075 ERASEINFO(0x10000, 63), 1059 ERASEINFO(0x10000, 63),
1076 } 1060 }
1077 }, { 1061 }, {
1078 .mfr_id = MANUFACTURER_INTEL, 1062 .mfr_id = CFI_MFR_INTEL,
1079 .dev_id = I28F320B3T, 1063 .dev_id = I28F320B3T,
1080 .name = "Intel 28F320B3T", 1064 .name = "Intel 28F320B3T",
1081 .devtypes = CFI_DEVICETYPE_X16, 1065 .devtypes = CFI_DEVICETYPE_X16,
@@ -1088,7 +1072,7 @@ static const struct amd_flash_info jedec_table[] = {
1088 ERASEINFO(0x02000, 8), 1072 ERASEINFO(0x02000, 8),
1089 } 1073 }
1090 }, { 1074 }, {
1091 .mfr_id = MANUFACTURER_INTEL, 1075 .mfr_id = CFI_MFR_INTEL,
1092 .dev_id = I28F640B3B, 1076 .dev_id = I28F640B3B,
1093 .name = "Intel 28F640B3B", 1077 .name = "Intel 28F640B3B",
1094 .devtypes = CFI_DEVICETYPE_X16, 1078 .devtypes = CFI_DEVICETYPE_X16,
@@ -1101,7 +1085,7 @@ static const struct amd_flash_info jedec_table[] = {
1101 ERASEINFO(0x10000, 127), 1085 ERASEINFO(0x10000, 127),
1102 } 1086 }
1103 }, { 1087 }, {
1104 .mfr_id = MANUFACTURER_INTEL, 1088 .mfr_id = CFI_MFR_INTEL,
1105 .dev_id = I28F640B3T, 1089 .dev_id = I28F640B3T,
1106 .name = "Intel 28F640B3T", 1090 .name = "Intel 28F640B3T",
1107 .devtypes = CFI_DEVICETYPE_X16, 1091 .devtypes = CFI_DEVICETYPE_X16,
@@ -1114,7 +1098,7 @@ static const struct amd_flash_info jedec_table[] = {
1114 ERASEINFO(0x02000, 8), 1098 ERASEINFO(0x02000, 8),
1115 } 1099 }
1116 }, { 1100 }, {
1117 .mfr_id = MANUFACTURER_INTEL, 1101 .mfr_id = CFI_MFR_INTEL,
1118 .dev_id = I28F640C3B, 1102 .dev_id = I28F640C3B,
1119 .name = "Intel 28F640C3B", 1103 .name = "Intel 28F640C3B",
1120 .devtypes = CFI_DEVICETYPE_X16, 1104 .devtypes = CFI_DEVICETYPE_X16,
@@ -1127,7 +1111,7 @@ static const struct amd_flash_info jedec_table[] = {
1127 ERASEINFO(0x10000, 127), 1111 ERASEINFO(0x10000, 127),
1128 } 1112 }
1129 }, { 1113 }, {
1130 .mfr_id = MANUFACTURER_INTEL, 1114 .mfr_id = CFI_MFR_INTEL,
1131 .dev_id = I82802AB, 1115 .dev_id = I82802AB,
1132 .name = "Intel 82802AB", 1116 .name = "Intel 82802AB",
1133 .devtypes = CFI_DEVICETYPE_X8, 1117 .devtypes = CFI_DEVICETYPE_X8,
@@ -1139,7 +1123,7 @@ static const struct amd_flash_info jedec_table[] = {
1139 ERASEINFO(0x10000,8), 1123 ERASEINFO(0x10000,8),
1140 } 1124 }
1141 }, { 1125 }, {
1142 .mfr_id = MANUFACTURER_INTEL, 1126 .mfr_id = CFI_MFR_INTEL,
1143 .dev_id = I82802AC, 1127 .dev_id = I82802AC,
1144 .name = "Intel 82802AC", 1128 .name = "Intel 82802AC",
1145 .devtypes = CFI_DEVICETYPE_X8, 1129 .devtypes = CFI_DEVICETYPE_X8,
@@ -1151,7 +1135,7 @@ static const struct amd_flash_info jedec_table[] = {
1151 ERASEINFO(0x10000,16), 1135 ERASEINFO(0x10000,16),
1152 } 1136 }
1153 }, { 1137 }, {
1154 .mfr_id = MANUFACTURER_MACRONIX, 1138 .mfr_id = CFI_MFR_MACRONIX,
1155 .dev_id = MX29LV040C, 1139 .dev_id = MX29LV040C,
1156 .name = "Macronix MX29LV040C", 1140 .name = "Macronix MX29LV040C",
1157 .devtypes = CFI_DEVICETYPE_X8, 1141 .devtypes = CFI_DEVICETYPE_X8,
@@ -1163,7 +1147,7 @@ static const struct amd_flash_info jedec_table[] = {
1163 ERASEINFO(0x10000,8), 1147 ERASEINFO(0x10000,8),
1164 } 1148 }
1165 }, { 1149 }, {
1166 .mfr_id = MANUFACTURER_MACRONIX, 1150 .mfr_id = CFI_MFR_MACRONIX,
1167 .dev_id = MX29LV160T, 1151 .dev_id = MX29LV160T,
1168 .name = "MXIC MX29LV160T", 1152 .name = "MXIC MX29LV160T",
1169 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1153 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1178,7 +1162,7 @@ static const struct amd_flash_info jedec_table[] = {
1178 ERASEINFO(0x04000,1) 1162 ERASEINFO(0x04000,1)
1179 } 1163 }
1180 }, { 1164 }, {
1181 .mfr_id = MANUFACTURER_NEC, 1165 .mfr_id = CFI_MFR_NEC,
1182 .dev_id = UPD29F064115, 1166 .dev_id = UPD29F064115,
1183 .name = "NEC uPD29F064115", 1167 .name = "NEC uPD29F064115",
1184 .devtypes = CFI_DEVICETYPE_X16, 1168 .devtypes = CFI_DEVICETYPE_X16,
@@ -1192,7 +1176,7 @@ static const struct amd_flash_info jedec_table[] = {
1192 ERASEINFO(0x2000,8), 1176 ERASEINFO(0x2000,8),
1193 } 1177 }
1194 }, { 1178 }, {
1195 .mfr_id = MANUFACTURER_MACRONIX, 1179 .mfr_id = CFI_MFR_MACRONIX,
1196 .dev_id = MX29LV160B, 1180 .dev_id = MX29LV160B,
1197 .name = "MXIC MX29LV160B", 1181 .name = "MXIC MX29LV160B",
1198 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1182 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1207,7 +1191,7 @@ static const struct amd_flash_info jedec_table[] = {
1207 ERASEINFO(0x10000,31) 1191 ERASEINFO(0x10000,31)
1208 } 1192 }
1209 }, { 1193 }, {
1210 .mfr_id = MANUFACTURER_MACRONIX, 1194 .mfr_id = CFI_MFR_MACRONIX,
1211 .dev_id = MX29F040, 1195 .dev_id = MX29F040,
1212 .name = "Macronix MX29F040", 1196 .name = "Macronix MX29F040",
1213 .devtypes = CFI_DEVICETYPE_X8, 1197 .devtypes = CFI_DEVICETYPE_X8,
@@ -1219,7 +1203,7 @@ static const struct amd_flash_info jedec_table[] = {
1219 ERASEINFO(0x10000,8), 1203 ERASEINFO(0x10000,8),
1220 } 1204 }
1221 }, { 1205 }, {
1222 .mfr_id = MANUFACTURER_MACRONIX, 1206 .mfr_id = CFI_MFR_MACRONIX,
1223 .dev_id = MX29F016, 1207 .dev_id = MX29F016,
1224 .name = "Macronix MX29F016", 1208 .name = "Macronix MX29F016",
1225 .devtypes = CFI_DEVICETYPE_X8, 1209 .devtypes = CFI_DEVICETYPE_X8,
@@ -1231,7 +1215,7 @@ static const struct amd_flash_info jedec_table[] = {
1231 ERASEINFO(0x10000,32), 1215 ERASEINFO(0x10000,32),
1232 } 1216 }
1233 }, { 1217 }, {
1234 .mfr_id = MANUFACTURER_MACRONIX, 1218 .mfr_id = CFI_MFR_MACRONIX,
1235 .dev_id = MX29F004T, 1219 .dev_id = MX29F004T,
1236 .name = "Macronix MX29F004T", 1220 .name = "Macronix MX29F004T",
1237 .devtypes = CFI_DEVICETYPE_X8, 1221 .devtypes = CFI_DEVICETYPE_X8,
@@ -1246,7 +1230,7 @@ static const struct amd_flash_info jedec_table[] = {
1246 ERASEINFO(0x04000,1), 1230 ERASEINFO(0x04000,1),
1247 } 1231 }
1248 }, { 1232 }, {
1249 .mfr_id = MANUFACTURER_MACRONIX, 1233 .mfr_id = CFI_MFR_MACRONIX,
1250 .dev_id = MX29F004B, 1234 .dev_id = MX29F004B,
1251 .name = "Macronix MX29F004B", 1235 .name = "Macronix MX29F004B",
1252 .devtypes = CFI_DEVICETYPE_X8, 1236 .devtypes = CFI_DEVICETYPE_X8,
@@ -1261,7 +1245,7 @@ static const struct amd_flash_info jedec_table[] = {
1261 ERASEINFO(0x10000,7), 1245 ERASEINFO(0x10000,7),
1262 } 1246 }
1263 }, { 1247 }, {
1264 .mfr_id = MANUFACTURER_MACRONIX, 1248 .mfr_id = CFI_MFR_MACRONIX,
1265 .dev_id = MX29F002T, 1249 .dev_id = MX29F002T,
1266 .name = "Macronix MX29F002T", 1250 .name = "Macronix MX29F002T",
1267 .devtypes = CFI_DEVICETYPE_X8, 1251 .devtypes = CFI_DEVICETYPE_X8,
@@ -1276,7 +1260,7 @@ static const struct amd_flash_info jedec_table[] = {
1276 ERASEINFO(0x04000,1), 1260 ERASEINFO(0x04000,1),
1277 } 1261 }
1278 }, { 1262 }, {
1279 .mfr_id = MANUFACTURER_PMC, 1263 .mfr_id = CFI_MFR_PMC,
1280 .dev_id = PM49FL002, 1264 .dev_id = PM49FL002,
1281 .name = "PMC Pm49FL002", 1265 .name = "PMC Pm49FL002",
1282 .devtypes = CFI_DEVICETYPE_X8, 1266 .devtypes = CFI_DEVICETYPE_X8,
@@ -1288,7 +1272,7 @@ static const struct amd_flash_info jedec_table[] = {
1288 ERASEINFO( 0x01000, 64 ) 1272 ERASEINFO( 0x01000, 64 )
1289 } 1273 }
1290 }, { 1274 }, {
1291 .mfr_id = MANUFACTURER_PMC, 1275 .mfr_id = CFI_MFR_PMC,
1292 .dev_id = PM49FL004, 1276 .dev_id = PM49FL004,
1293 .name = "PMC Pm49FL004", 1277 .name = "PMC Pm49FL004",
1294 .devtypes = CFI_DEVICETYPE_X8, 1278 .devtypes = CFI_DEVICETYPE_X8,
@@ -1300,7 +1284,7 @@ static const struct amd_flash_info jedec_table[] = {
1300 ERASEINFO( 0x01000, 128 ) 1284 ERASEINFO( 0x01000, 128 )
1301 } 1285 }
1302 }, { 1286 }, {
1303 .mfr_id = MANUFACTURER_PMC, 1287 .mfr_id = CFI_MFR_PMC,
1304 .dev_id = PM49FL008, 1288 .dev_id = PM49FL008,
1305 .name = "PMC Pm49FL008", 1289 .name = "PMC Pm49FL008",
1306 .devtypes = CFI_DEVICETYPE_X8, 1290 .devtypes = CFI_DEVICETYPE_X8,
@@ -1312,7 +1296,7 @@ static const struct amd_flash_info jedec_table[] = {
1312 ERASEINFO( 0x01000, 256 ) 1296 ERASEINFO( 0x01000, 256 )
1313 } 1297 }
1314 }, { 1298 }, {
1315 .mfr_id = MANUFACTURER_SHARP, 1299 .mfr_id = CFI_MFR_SHARP,
1316 .dev_id = LH28F640BF, 1300 .dev_id = LH28F640BF,
1317 .name = "LH28F640BF", 1301 .name = "LH28F640BF",
1318 .devtypes = CFI_DEVICETYPE_X8, 1302 .devtypes = CFI_DEVICETYPE_X8,
@@ -1324,7 +1308,7 @@ static const struct amd_flash_info jedec_table[] = {
1324 ERASEINFO(0x40000,16), 1308 ERASEINFO(0x40000,16),
1325 } 1309 }
1326 }, { 1310 }, {
1327 .mfr_id = MANUFACTURER_SST, 1311 .mfr_id = CFI_MFR_SST,
1328 .dev_id = SST39LF512, 1312 .dev_id = SST39LF512,
1329 .name = "SST 39LF512", 1313 .name = "SST 39LF512",
1330 .devtypes = CFI_DEVICETYPE_X8, 1314 .devtypes = CFI_DEVICETYPE_X8,
@@ -1336,7 +1320,7 @@ static const struct amd_flash_info jedec_table[] = {
1336 ERASEINFO(0x01000,16), 1320 ERASEINFO(0x01000,16),
1337 } 1321 }
1338 }, { 1322 }, {
1339 .mfr_id = MANUFACTURER_SST, 1323 .mfr_id = CFI_MFR_SST,
1340 .dev_id = SST39LF010, 1324 .dev_id = SST39LF010,
1341 .name = "SST 39LF010", 1325 .name = "SST 39LF010",
1342 .devtypes = CFI_DEVICETYPE_X8, 1326 .devtypes = CFI_DEVICETYPE_X8,
@@ -1348,8 +1332,8 @@ static const struct amd_flash_info jedec_table[] = {
1348 ERASEINFO(0x01000,32), 1332 ERASEINFO(0x01000,32),
1349 } 1333 }
1350 }, { 1334 }, {
1351 .mfr_id = MANUFACTURER_SST, 1335 .mfr_id = CFI_MFR_SST,
1352 .dev_id = SST29EE020, 1336 .dev_id = SST29EE020,
1353 .name = "SST 29EE020", 1337 .name = "SST 29EE020",
1354 .devtypes = CFI_DEVICETYPE_X8, 1338 .devtypes = CFI_DEVICETYPE_X8,
1355 .uaddr = MTD_UADDR_0x5555_0x2AAA, 1339 .uaddr = MTD_UADDR_0x5555_0x2AAA,
@@ -1359,9 +1343,9 @@ static const struct amd_flash_info jedec_table[] = {
1359 .regions = {ERASEINFO(0x01000,64), 1343 .regions = {ERASEINFO(0x01000,64),
1360 } 1344 }
1361 }, { 1345 }, {
1362 .mfr_id = MANUFACTURER_SST, 1346 .mfr_id = CFI_MFR_SST,
1363 .dev_id = SST29LE020, 1347 .dev_id = SST29LE020,
1364 .name = "SST 29LE020", 1348 .name = "SST 29LE020",
1365 .devtypes = CFI_DEVICETYPE_X8, 1349 .devtypes = CFI_DEVICETYPE_X8,
1366 .uaddr = MTD_UADDR_0x5555_0x2AAA, 1350 .uaddr = MTD_UADDR_0x5555_0x2AAA,
1367 .dev_size = SIZE_256KiB, 1351 .dev_size = SIZE_256KiB,
@@ -1370,7 +1354,7 @@ static const struct amd_flash_info jedec_table[] = {
1370 .regions = {ERASEINFO(0x01000,64), 1354 .regions = {ERASEINFO(0x01000,64),
1371 } 1355 }
1372 }, { 1356 }, {
1373 .mfr_id = MANUFACTURER_SST, 1357 .mfr_id = CFI_MFR_SST,
1374 .dev_id = SST39LF020, 1358 .dev_id = SST39LF020,
1375 .name = "SST 39LF020", 1359 .name = "SST 39LF020",
1376 .devtypes = CFI_DEVICETYPE_X8, 1360 .devtypes = CFI_DEVICETYPE_X8,
@@ -1382,7 +1366,7 @@ static const struct amd_flash_info jedec_table[] = {
1382 ERASEINFO(0x01000,64), 1366 ERASEINFO(0x01000,64),
1383 } 1367 }
1384 }, { 1368 }, {
1385 .mfr_id = MANUFACTURER_SST, 1369 .mfr_id = CFI_MFR_SST,
1386 .dev_id = SST39LF040, 1370 .dev_id = SST39LF040,
1387 .name = "SST 39LF040", 1371 .name = "SST 39LF040",
1388 .devtypes = CFI_DEVICETYPE_X8, 1372 .devtypes = CFI_DEVICETYPE_X8,
@@ -1394,7 +1378,7 @@ static const struct amd_flash_info jedec_table[] = {
1394 ERASEINFO(0x01000,128), 1378 ERASEINFO(0x01000,128),
1395 } 1379 }
1396 }, { 1380 }, {
1397 .mfr_id = MANUFACTURER_SST, 1381 .mfr_id = CFI_MFR_SST,
1398 .dev_id = SST39SF010A, 1382 .dev_id = SST39SF010A,
1399 .name = "SST 39SF010A", 1383 .name = "SST 39SF010A",
1400 .devtypes = CFI_DEVICETYPE_X8, 1384 .devtypes = CFI_DEVICETYPE_X8,
@@ -1406,7 +1390,7 @@ static const struct amd_flash_info jedec_table[] = {
1406 ERASEINFO(0x01000,32), 1390 ERASEINFO(0x01000,32),
1407 } 1391 }
1408 }, { 1392 }, {
1409 .mfr_id = MANUFACTURER_SST, 1393 .mfr_id = CFI_MFR_SST,
1410 .dev_id = SST39SF020A, 1394 .dev_id = SST39SF020A,
1411 .name = "SST 39SF020A", 1395 .name = "SST 39SF020A",
1412 .devtypes = CFI_DEVICETYPE_X8, 1396 .devtypes = CFI_DEVICETYPE_X8,
@@ -1418,7 +1402,7 @@ static const struct amd_flash_info jedec_table[] = {
1418 ERASEINFO(0x01000,64), 1402 ERASEINFO(0x01000,64),
1419 } 1403 }
1420 }, { 1404 }, {
1421 .mfr_id = MANUFACTURER_SST, 1405 .mfr_id = CFI_MFR_SST,
1422 .dev_id = SST39SF040, 1406 .dev_id = SST39SF040,
1423 .name = "SST 39SF040", 1407 .name = "SST 39SF040",
1424 .devtypes = CFI_DEVICETYPE_X8, 1408 .devtypes = CFI_DEVICETYPE_X8,
@@ -1430,7 +1414,7 @@ static const struct amd_flash_info jedec_table[] = {
1430 ERASEINFO(0x01000,128), 1414 ERASEINFO(0x01000,128),
1431 } 1415 }
1432 }, { 1416 }, {
1433 .mfr_id = MANUFACTURER_SST, 1417 .mfr_id = CFI_MFR_SST,
1434 .dev_id = SST49LF040B, 1418 .dev_id = SST49LF040B,
1435 .name = "SST 49LF040B", 1419 .name = "SST 49LF040B",
1436 .devtypes = CFI_DEVICETYPE_X8, 1420 .devtypes = CFI_DEVICETYPE_X8,
@@ -1443,7 +1427,7 @@ static const struct amd_flash_info jedec_table[] = {
1443 } 1427 }
1444 }, { 1428 }, {
1445 1429
1446 .mfr_id = MANUFACTURER_SST, 1430 .mfr_id = CFI_MFR_SST,
1447 .dev_id = SST49LF004B, 1431 .dev_id = SST49LF004B,
1448 .name = "SST 49LF004B", 1432 .name = "SST 49LF004B",
1449 .devtypes = CFI_DEVICETYPE_X8, 1433 .devtypes = CFI_DEVICETYPE_X8,
@@ -1455,7 +1439,7 @@ static const struct amd_flash_info jedec_table[] = {
1455 ERASEINFO(0x01000,128), 1439 ERASEINFO(0x01000,128),
1456 } 1440 }
1457 }, { 1441 }, {
1458 .mfr_id = MANUFACTURER_SST, 1442 .mfr_id = CFI_MFR_SST,
1459 .dev_id = SST49LF008A, 1443 .dev_id = SST49LF008A,
1460 .name = "SST 49LF008A", 1444 .name = "SST 49LF008A",
1461 .devtypes = CFI_DEVICETYPE_X8, 1445 .devtypes = CFI_DEVICETYPE_X8,
@@ -1467,7 +1451,7 @@ static const struct amd_flash_info jedec_table[] = {
1467 ERASEINFO(0x01000,256), 1451 ERASEINFO(0x01000,256),
1468 } 1452 }
1469 }, { 1453 }, {
1470 .mfr_id = MANUFACTURER_SST, 1454 .mfr_id = CFI_MFR_SST,
1471 .dev_id = SST49LF030A, 1455 .dev_id = SST49LF030A,
1472 .name = "SST 49LF030A", 1456 .name = "SST 49LF030A",
1473 .devtypes = CFI_DEVICETYPE_X8, 1457 .devtypes = CFI_DEVICETYPE_X8,
@@ -1479,7 +1463,7 @@ static const struct amd_flash_info jedec_table[] = {
1479 ERASEINFO(0x01000,96), 1463 ERASEINFO(0x01000,96),
1480 } 1464 }
1481 }, { 1465 }, {
1482 .mfr_id = MANUFACTURER_SST, 1466 .mfr_id = CFI_MFR_SST,
1483 .dev_id = SST49LF040A, 1467 .dev_id = SST49LF040A,
1484 .name = "SST 49LF040A", 1468 .name = "SST 49LF040A",
1485 .devtypes = CFI_DEVICETYPE_X8, 1469 .devtypes = CFI_DEVICETYPE_X8,
@@ -1491,7 +1475,7 @@ static const struct amd_flash_info jedec_table[] = {
1491 ERASEINFO(0x01000,128), 1475 ERASEINFO(0x01000,128),
1492 } 1476 }
1493 }, { 1477 }, {
1494 .mfr_id = MANUFACTURER_SST, 1478 .mfr_id = CFI_MFR_SST,
1495 .dev_id = SST49LF080A, 1479 .dev_id = SST49LF080A,
1496 .name = "SST 49LF080A", 1480 .name = "SST 49LF080A",
1497 .devtypes = CFI_DEVICETYPE_X8, 1481 .devtypes = CFI_DEVICETYPE_X8,
@@ -1503,7 +1487,7 @@ static const struct amd_flash_info jedec_table[] = {
1503 ERASEINFO(0x01000,256), 1487 ERASEINFO(0x01000,256),
1504 } 1488 }
1505 }, { 1489 }, {
1506 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1490 .mfr_id = CFI_MFR_SST, /* should be CFI */
1507 .dev_id = SST39LF160, 1491 .dev_id = SST39LF160,
1508 .name = "SST 39LF160", 1492 .name = "SST 39LF160",
1509 .devtypes = CFI_DEVICETYPE_X16, 1493 .devtypes = CFI_DEVICETYPE_X16,
@@ -1516,7 +1500,7 @@ static const struct amd_flash_info jedec_table[] = {
1516 ERASEINFO(0x1000,256) 1500 ERASEINFO(0x1000,256)
1517 } 1501 }
1518 }, { 1502 }, {
1519 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1503 .mfr_id = CFI_MFR_SST, /* should be CFI */
1520 .dev_id = SST39VF1601, 1504 .dev_id = SST39VF1601,
1521 .name = "SST 39VF1601", 1505 .name = "SST 39VF1601",
1522 .devtypes = CFI_DEVICETYPE_X16, 1506 .devtypes = CFI_DEVICETYPE_X16,
@@ -1529,7 +1513,35 @@ static const struct amd_flash_info jedec_table[] = {
1529 ERASEINFO(0x1000,256) 1513 ERASEINFO(0x1000,256)
1530 } 1514 }
1531 }, { 1515 }, {
1532 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 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 }, {
1544 .mfr_id = CFI_MFR_SST, /* should be CFI */
1533 .dev_id = SST39VF3201, 1545 .dev_id = SST39VF3201,
1534 .name = "SST 39VF3201", 1546 .name = "SST 39VF3201",
1535 .devtypes = CFI_DEVICETYPE_X16, 1547 .devtypes = CFI_DEVICETYPE_X16,
@@ -1544,7 +1556,7 @@ static const struct amd_flash_info jedec_table[] = {
1544 ERASEINFO(0x1000,256) 1556 ERASEINFO(0x1000,256)
1545 } 1557 }
1546 }, { 1558 }, {
1547 .mfr_id = MANUFACTURER_SST, 1559 .mfr_id = CFI_MFR_SST,
1548 .dev_id = SST36VF3203, 1560 .dev_id = SST36VF3203,
1549 .name = "SST 36VF3203", 1561 .name = "SST 36VF3203",
1550 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1562 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1556,7 +1568,7 @@ static const struct amd_flash_info jedec_table[] = {
1556 ERASEINFO(0x10000,64), 1568 ERASEINFO(0x10000,64),
1557 } 1569 }
1558 }, { 1570 }, {
1559 .mfr_id = MANUFACTURER_ST, 1571 .mfr_id = CFI_MFR_ST,
1560 .dev_id = M29F800AB, 1572 .dev_id = M29F800AB,
1561 .name = "ST M29F800AB", 1573 .name = "ST M29F800AB",
1562 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1574 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1571,7 +1583,7 @@ static const struct amd_flash_info jedec_table[] = {
1571 ERASEINFO(0x10000,15), 1583 ERASEINFO(0x10000,15),
1572 } 1584 }
1573 }, { 1585 }, {
1574 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1586 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1575 .dev_id = M29W800DT, 1587 .dev_id = M29W800DT,
1576 .name = "ST M29W800DT", 1588 .name = "ST M29W800DT",
1577 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1589 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1586,7 +1598,7 @@ static const struct amd_flash_info jedec_table[] = {
1586 ERASEINFO(0x04000,1) 1598 ERASEINFO(0x04000,1)
1587 } 1599 }
1588 }, { 1600 }, {
1589 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1601 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1590 .dev_id = M29W800DB, 1602 .dev_id = M29W800DB,
1591 .name = "ST M29W800DB", 1603 .name = "ST M29W800DB",
1592 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1604 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1601,7 +1613,7 @@ static const struct amd_flash_info jedec_table[] = {
1601 ERASEINFO(0x10000,15) 1613 ERASEINFO(0x10000,15)
1602 } 1614 }
1603 }, { 1615 }, {
1604 .mfr_id = MANUFACTURER_ST, 1616 .mfr_id = CFI_MFR_ST,
1605 .dev_id = M29W400DT, 1617 .dev_id = M29W400DT,
1606 .name = "ST M29W400DT", 1618 .name = "ST M29W400DT",
1607 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1619 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1616,7 +1628,7 @@ static const struct amd_flash_info jedec_table[] = {
1616 ERASEINFO(0x10000,1) 1628 ERASEINFO(0x10000,1)
1617 } 1629 }
1618 }, { 1630 }, {
1619 .mfr_id = MANUFACTURER_ST, 1631 .mfr_id = CFI_MFR_ST,
1620 .dev_id = M29W400DB, 1632 .dev_id = M29W400DB,
1621 .name = "ST M29W400DB", 1633 .name = "ST M29W400DB",
1622 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1634 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1631,7 +1643,7 @@ static const struct amd_flash_info jedec_table[] = {
1631 ERASEINFO(0x10000,7) 1643 ERASEINFO(0x10000,7)
1632 } 1644 }
1633 }, { 1645 }, {
1634 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1646 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1635 .dev_id = M29W160DT, 1647 .dev_id = M29W160DT,
1636 .name = "ST M29W160DT", 1648 .name = "ST M29W160DT",
1637 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1649 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1646,7 +1658,7 @@ static const struct amd_flash_info jedec_table[] = {
1646 ERASEINFO(0x04000,1) 1658 ERASEINFO(0x04000,1)
1647 } 1659 }
1648 }, { 1660 }, {
1649 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1661 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1650 .dev_id = M29W160DB, 1662 .dev_id = M29W160DB,
1651 .name = "ST M29W160DB", 1663 .name = "ST M29W160DB",
1652 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1664 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1661,7 +1673,7 @@ static const struct amd_flash_info jedec_table[] = {
1661 ERASEINFO(0x10000,31) 1673 ERASEINFO(0x10000,31)
1662 } 1674 }
1663 }, { 1675 }, {
1664 .mfr_id = MANUFACTURER_ST, 1676 .mfr_id = CFI_MFR_ST,
1665 .dev_id = M29W040B, 1677 .dev_id = M29W040B,
1666 .name = "ST M29W040B", 1678 .name = "ST M29W040B",
1667 .devtypes = CFI_DEVICETYPE_X8, 1679 .devtypes = CFI_DEVICETYPE_X8,
@@ -1673,7 +1685,7 @@ static const struct amd_flash_info jedec_table[] = {
1673 ERASEINFO(0x10000,8), 1685 ERASEINFO(0x10000,8),
1674 } 1686 }
1675 }, { 1687 }, {
1676 .mfr_id = MANUFACTURER_ST, 1688 .mfr_id = CFI_MFR_ST,
1677 .dev_id = M50FW040, 1689 .dev_id = M50FW040,
1678 .name = "ST M50FW040", 1690 .name = "ST M50FW040",
1679 .devtypes = CFI_DEVICETYPE_X8, 1691 .devtypes = CFI_DEVICETYPE_X8,
@@ -1685,7 +1697,7 @@ static const struct amd_flash_info jedec_table[] = {
1685 ERASEINFO(0x10000,8), 1697 ERASEINFO(0x10000,8),
1686 } 1698 }
1687 }, { 1699 }, {
1688 .mfr_id = MANUFACTURER_ST, 1700 .mfr_id = CFI_MFR_ST,
1689 .dev_id = M50FW080, 1701 .dev_id = M50FW080,
1690 .name = "ST M50FW080", 1702 .name = "ST M50FW080",
1691 .devtypes = CFI_DEVICETYPE_X8, 1703 .devtypes = CFI_DEVICETYPE_X8,
@@ -1697,7 +1709,7 @@ static const struct amd_flash_info jedec_table[] = {
1697 ERASEINFO(0x10000,16), 1709 ERASEINFO(0x10000,16),
1698 } 1710 }
1699 }, { 1711 }, {
1700 .mfr_id = MANUFACTURER_ST, 1712 .mfr_id = CFI_MFR_ST,
1701 .dev_id = M50FW016, 1713 .dev_id = M50FW016,
1702 .name = "ST M50FW016", 1714 .name = "ST M50FW016",
1703 .devtypes = CFI_DEVICETYPE_X8, 1715 .devtypes = CFI_DEVICETYPE_X8,
@@ -1709,7 +1721,7 @@ static const struct amd_flash_info jedec_table[] = {
1709 ERASEINFO(0x10000,32), 1721 ERASEINFO(0x10000,32),
1710 } 1722 }
1711 }, { 1723 }, {
1712 .mfr_id = MANUFACTURER_ST, 1724 .mfr_id = CFI_MFR_ST,
1713 .dev_id = M50LPW080, 1725 .dev_id = M50LPW080,
1714 .name = "ST M50LPW080", 1726 .name = "ST M50LPW080",
1715 .devtypes = CFI_DEVICETYPE_X8, 1727 .devtypes = CFI_DEVICETYPE_X8,
@@ -1721,7 +1733,7 @@ static const struct amd_flash_info jedec_table[] = {
1721 ERASEINFO(0x10000,16), 1733 ERASEINFO(0x10000,16),
1722 }, 1734 },
1723 }, { 1735 }, {
1724 .mfr_id = MANUFACTURER_ST, 1736 .mfr_id = CFI_MFR_ST,
1725 .dev_id = M50FLW080A, 1737 .dev_id = M50FLW080A,
1726 .name = "ST M50FLW080A", 1738 .name = "ST M50FLW080A",
1727 .devtypes = CFI_DEVICETYPE_X8, 1739 .devtypes = CFI_DEVICETYPE_X8,
@@ -1736,7 +1748,7 @@ static const struct amd_flash_info jedec_table[] = {
1736 ERASEINFO(0x1000,16), 1748 ERASEINFO(0x1000,16),
1737 } 1749 }
1738 }, { 1750 }, {
1739 .mfr_id = MANUFACTURER_ST, 1751 .mfr_id = CFI_MFR_ST,
1740 .dev_id = M50FLW080B, 1752 .dev_id = M50FLW080B,
1741 .name = "ST M50FLW080B", 1753 .name = "ST M50FLW080B",
1742 .devtypes = CFI_DEVICETYPE_X8, 1754 .devtypes = CFI_DEVICETYPE_X8,
@@ -1751,7 +1763,7 @@ static const struct amd_flash_info jedec_table[] = {
1751 ERASEINFO(0x1000,16), 1763 ERASEINFO(0x1000,16),
1752 } 1764 }
1753 }, { 1765 }, {
1754 .mfr_id = 0xff00 | MANUFACTURER_ST, 1766 .mfr_id = 0xff00 | CFI_MFR_ST,
1755 .dev_id = 0xff00 | PSD4256G6V, 1767 .dev_id = 0xff00 | PSD4256G6V,
1756 .name = "ST PSD4256G6V", 1768 .name = "ST PSD4256G6V",
1757 .devtypes = CFI_DEVICETYPE_X16, 1769 .devtypes = CFI_DEVICETYPE_X16,
@@ -1763,7 +1775,7 @@ static const struct amd_flash_info jedec_table[] = {
1763 ERASEINFO(0x10000,16), 1775 ERASEINFO(0x10000,16),
1764 } 1776 }
1765 }, { 1777 }, {
1766 .mfr_id = MANUFACTURER_TOSHIBA, 1778 .mfr_id = CFI_MFR_TOSHIBA,
1767 .dev_id = TC58FVT160, 1779 .dev_id = TC58FVT160,
1768 .name = "Toshiba TC58FVT160", 1780 .name = "Toshiba TC58FVT160",
1769 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1781 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1778,7 +1790,7 @@ static const struct amd_flash_info jedec_table[] = {
1778 ERASEINFO(0x04000,1) 1790 ERASEINFO(0x04000,1)
1779 } 1791 }
1780 }, { 1792 }, {
1781 .mfr_id = MANUFACTURER_TOSHIBA, 1793 .mfr_id = CFI_MFR_TOSHIBA,
1782 .dev_id = TC58FVB160, 1794 .dev_id = TC58FVB160,
1783 .name = "Toshiba TC58FVB160", 1795 .name = "Toshiba TC58FVB160",
1784 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1796 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1793,7 +1805,7 @@ static const struct amd_flash_info jedec_table[] = {
1793 ERASEINFO(0x10000,31) 1805 ERASEINFO(0x10000,31)
1794 } 1806 }
1795 }, { 1807 }, {
1796 .mfr_id = MANUFACTURER_TOSHIBA, 1808 .mfr_id = CFI_MFR_TOSHIBA,
1797 .dev_id = TC58FVB321, 1809 .dev_id = TC58FVB321,
1798 .name = "Toshiba TC58FVB321", 1810 .name = "Toshiba TC58FVB321",
1799 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1811 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1806,7 +1818,7 @@ static const struct amd_flash_info jedec_table[] = {
1806 ERASEINFO(0x10000,63) 1818 ERASEINFO(0x10000,63)
1807 } 1819 }
1808 }, { 1820 }, {
1809 .mfr_id = MANUFACTURER_TOSHIBA, 1821 .mfr_id = CFI_MFR_TOSHIBA,
1810 .dev_id = TC58FVT321, 1822 .dev_id = TC58FVT321,
1811 .name = "Toshiba TC58FVT321", 1823 .name = "Toshiba TC58FVT321",
1812 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1824 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1819,7 +1831,7 @@ static const struct amd_flash_info jedec_table[] = {
1819 ERASEINFO(0x02000,8) 1831 ERASEINFO(0x02000,8)
1820 } 1832 }
1821 }, { 1833 }, {
1822 .mfr_id = MANUFACTURER_TOSHIBA, 1834 .mfr_id = CFI_MFR_TOSHIBA,
1823 .dev_id = TC58FVB641, 1835 .dev_id = TC58FVB641,
1824 .name = "Toshiba TC58FVB641", 1836 .name = "Toshiba TC58FVB641",
1825 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1837 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1832,7 +1844,7 @@ static const struct amd_flash_info jedec_table[] = {
1832 ERASEINFO(0x10000,127) 1844 ERASEINFO(0x10000,127)
1833 } 1845 }
1834 }, { 1846 }, {
1835 .mfr_id = MANUFACTURER_TOSHIBA, 1847 .mfr_id = CFI_MFR_TOSHIBA,
1836 .dev_id = TC58FVT641, 1848 .dev_id = TC58FVT641,
1837 .name = "Toshiba TC58FVT641", 1849 .name = "Toshiba TC58FVT641",
1838 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1850 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1845,7 +1857,7 @@ static const struct amd_flash_info jedec_table[] = {
1845 ERASEINFO(0x02000,8) 1857 ERASEINFO(0x02000,8)
1846 } 1858 }
1847 }, { 1859 }, {
1848 .mfr_id = MANUFACTURER_WINBOND, 1860 .mfr_id = CFI_MFR_WINBOND,
1849 .dev_id = W49V002A, 1861 .dev_id = W49V002A,
1850 .name = "Winbond W49V002A", 1862 .name = "Winbond W49V002A",
1851 .devtypes = CFI_DEVICETYPE_X8, 1863 .devtypes = CFI_DEVICETYPE_X8,
@@ -1878,7 +1890,7 @@ static inline u32 jedec_read_mfr(struct map_info *map, uint32_t base,
1878 mask = (1 << (cfi->device_type * 8)) - 1; 1890 mask = (1 << (cfi->device_type * 8)) - 1;
1879 result = map_read(map, base + ofs); 1891 result = map_read(map, base + ofs);
1880 bank++; 1892 bank++;
1881 } while ((result.x[0] & mask) == CONTINUATION_CODE); 1893 } while ((result.x[0] & mask) == CFI_MFR_CONTINUATION);
1882 1894
1883 return result.x[0] & mask; 1895 return result.x[0] & mask;
1884} 1896}
@@ -1969,7 +1981,7 @@ static int cfi_jedec_setup(struct cfi_private *p_cfi, int index)
1969 p_cfi->addr_unlock1 = unlock_addrs[uaddr].addr1 / p_cfi->device_type; 1981 p_cfi->addr_unlock1 = unlock_addrs[uaddr].addr1 / p_cfi->device_type;
1970 p_cfi->addr_unlock2 = unlock_addrs[uaddr].addr2 / p_cfi->device_type; 1982 p_cfi->addr_unlock2 = unlock_addrs[uaddr].addr2 / p_cfi->device_type;
1971 1983
1972 return 1; /* ok */ 1984 return 1; /* ok */
1973} 1985}
1974 1986
1975 1987
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 17:58:50 -0500