aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-04-26 22:19:34 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-05-13 20:48:58 -0400
commitae731822294468f213f2b56a0ddfc425148c873b (patch)
tree54be54253da025d47bf028256db9f9376fecf45f
parent087444da61ed972b3c2bfbf7dcf317cb4475f143 (diff)
mtd: chips: use common manufacturer codes in jedec_probe()
Factor out old manufacturers and use the generic ones from cfi.h Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat
-rw-r--r--drivers/mtd/chips/jedec_probe.c252
-rw-r--r--include/linux/mtd/cfi.h13
2 files changed, 128 insertions, 137 deletions
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 8db1148dfa47..04fb45cacc31 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
@@ -309,7 +291,7 @@ struct amd_flash_info {
309 */ 291 */
310static const struct amd_flash_info jedec_table[] = { 292static const struct amd_flash_info jedec_table[] = {
311 { 293 {
312 .mfr_id = MANUFACTURER_AMD, 294 .mfr_id = CFI_MFR_AMD,
313 .dev_id = AM29F032B, 295 .dev_id = AM29F032B,
314 .name = "AMD AM29F032B", 296 .name = "AMD AM29F032B",
315 .uaddr = MTD_UADDR_0x0555_0x02AA, 297 .uaddr = MTD_UADDR_0x0555_0x02AA,
@@ -321,7 +303,7 @@ static const struct amd_flash_info jedec_table[] = {
321 ERASEINFO(0x10000,64) 303 ERASEINFO(0x10000,64)
322 } 304 }
323 }, { 305 }, {
324 .mfr_id = MANUFACTURER_AMD, 306 .mfr_id = CFI_MFR_AMD,
325 .dev_id = AM29LV160DT, 307 .dev_id = AM29LV160DT,
326 .name = "AMD AM29LV160DT", 308 .name = "AMD AM29LV160DT",
327 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 309 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -336,7 +318,7 @@ static const struct amd_flash_info jedec_table[] = {
336 ERASEINFO(0x04000,1) 318 ERASEINFO(0x04000,1)
337 } 319 }
338 }, { 320 }, {
339 .mfr_id = MANUFACTURER_AMD, 321 .mfr_id = CFI_MFR_AMD,
340 .dev_id = AM29LV160DB, 322 .dev_id = AM29LV160DB,
341 .name = "AMD AM29LV160DB", 323 .name = "AMD AM29LV160DB",
342 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 324 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -351,7 +333,7 @@ static const struct amd_flash_info jedec_table[] = {
351 ERASEINFO(0x10000,31) 333 ERASEINFO(0x10000,31)
352 } 334 }
353 }, { 335 }, {
354 .mfr_id = MANUFACTURER_AMD, 336 .mfr_id = CFI_MFR_AMD,
355 .dev_id = AM29LV400BB, 337 .dev_id = AM29LV400BB,
356 .name = "AMD AM29LV400BB", 338 .name = "AMD AM29LV400BB",
357 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 339 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -366,7 +348,7 @@ static const struct amd_flash_info jedec_table[] = {
366 ERASEINFO(0x10000,7) 348 ERASEINFO(0x10000,7)
367 } 349 }
368 }, { 350 }, {
369 .mfr_id = MANUFACTURER_AMD, 351 .mfr_id = CFI_MFR_AMD,
370 .dev_id = AM29LV400BT, 352 .dev_id = AM29LV400BT,
371 .name = "AMD AM29LV400BT", 353 .name = "AMD AM29LV400BT",
372 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 354 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -381,7 +363,7 @@ static const struct amd_flash_info jedec_table[] = {
381 ERASEINFO(0x04000,1) 363 ERASEINFO(0x04000,1)
382 } 364 }
383 }, { 365 }, {
384 .mfr_id = MANUFACTURER_AMD, 366 .mfr_id = CFI_MFR_AMD,
385 .dev_id = AM29LV800BB, 367 .dev_id = AM29LV800BB,
386 .name = "AMD AM29LV800BB", 368 .name = "AMD AM29LV800BB",
387 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 369 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -397,7 +379,7 @@ static const struct amd_flash_info jedec_table[] = {
397 } 379 }
398 }, { 380 }, {
399/* add DL */ 381/* add DL */
400 .mfr_id = MANUFACTURER_AMD, 382 .mfr_id = CFI_MFR_AMD,
401 .dev_id = AM29DL800BB, 383 .dev_id = AM29DL800BB,
402 .name = "AMD AM29DL800BB", 384 .name = "AMD AM29DL800BB",
403 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 385 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -414,7 +396,7 @@ static const struct amd_flash_info jedec_table[] = {
414 ERASEINFO(0x10000,14) 396 ERASEINFO(0x10000,14)
415 } 397 }
416 }, { 398 }, {
417 .mfr_id = MANUFACTURER_AMD, 399 .mfr_id = CFI_MFR_AMD,
418 .dev_id = AM29DL800BT, 400 .dev_id = AM29DL800BT,
419 .name = "AMD AM29DL800BT", 401 .name = "AMD AM29DL800BT",
420 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 402 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -431,7 +413,7 @@ static const struct amd_flash_info jedec_table[] = {
431 ERASEINFO(0x04000,1) 413 ERASEINFO(0x04000,1)
432 } 414 }
433 }, { 415 }, {
434 .mfr_id = MANUFACTURER_AMD, 416 .mfr_id = CFI_MFR_AMD,
435 .dev_id = AM29F800BB, 417 .dev_id = AM29F800BB,
436 .name = "AMD AM29F800BB", 418 .name = "AMD AM29F800BB",
437 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 419 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -446,7 +428,7 @@ static const struct amd_flash_info jedec_table[] = {
446 ERASEINFO(0x10000,15), 428 ERASEINFO(0x10000,15),
447 } 429 }
448 }, { 430 }, {
449 .mfr_id = MANUFACTURER_AMD, 431 .mfr_id = CFI_MFR_AMD,
450 .dev_id = AM29LV800BT, 432 .dev_id = AM29LV800BT,
451 .name = "AMD AM29LV800BT", 433 .name = "AMD AM29LV800BT",
452 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 434 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -461,7 +443,7 @@ static const struct amd_flash_info jedec_table[] = {
461 ERASEINFO(0x04000,1) 443 ERASEINFO(0x04000,1)
462 } 444 }
463 }, { 445 }, {
464 .mfr_id = MANUFACTURER_AMD, 446 .mfr_id = CFI_MFR_AMD,
465 .dev_id = AM29F800BT, 447 .dev_id = AM29F800BT,
466 .name = "AMD AM29F800BT", 448 .name = "AMD AM29F800BT",
467 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 449 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -476,7 +458,7 @@ static const struct amd_flash_info jedec_table[] = {
476 ERASEINFO(0x04000,1) 458 ERASEINFO(0x04000,1)
477 } 459 }
478 }, { 460 }, {
479 .mfr_id = MANUFACTURER_AMD, 461 .mfr_id = CFI_MFR_AMD,
480 .dev_id = AM29F017D, 462 .dev_id = AM29F017D,
481 .name = "AMD AM29F017D", 463 .name = "AMD AM29F017D",
482 .devtypes = CFI_DEVICETYPE_X8, 464 .devtypes = CFI_DEVICETYPE_X8,
@@ -488,7 +470,7 @@ static const struct amd_flash_info jedec_table[] = {
488 ERASEINFO(0x10000,32), 470 ERASEINFO(0x10000,32),
489 } 471 }
490 }, { 472 }, {
491 .mfr_id = MANUFACTURER_AMD, 473 .mfr_id = CFI_MFR_AMD,
492 .dev_id = AM29F016D, 474 .dev_id = AM29F016D,
493 .name = "AMD AM29F016D", 475 .name = "AMD AM29F016D",
494 .devtypes = CFI_DEVICETYPE_X8, 476 .devtypes = CFI_DEVICETYPE_X8,
@@ -500,7 +482,7 @@ static const struct amd_flash_info jedec_table[] = {
500 ERASEINFO(0x10000,32), 482 ERASEINFO(0x10000,32),
501 } 483 }
502 }, { 484 }, {
503 .mfr_id = MANUFACTURER_AMD, 485 .mfr_id = CFI_MFR_AMD,
504 .dev_id = AM29F080, 486 .dev_id = AM29F080,
505 .name = "AMD AM29F080", 487 .name = "AMD AM29F080",
506 .devtypes = CFI_DEVICETYPE_X8, 488 .devtypes = CFI_DEVICETYPE_X8,
@@ -512,7 +494,7 @@ static const struct amd_flash_info jedec_table[] = {
512 ERASEINFO(0x10000,16), 494 ERASEINFO(0x10000,16),
513 } 495 }
514 }, { 496 }, {
515 .mfr_id = MANUFACTURER_AMD, 497 .mfr_id = CFI_MFR_AMD,
516 .dev_id = AM29F040, 498 .dev_id = AM29F040,
517 .name = "AMD AM29F040", 499 .name = "AMD AM29F040",
518 .devtypes = CFI_DEVICETYPE_X8, 500 .devtypes = CFI_DEVICETYPE_X8,
@@ -524,7 +506,7 @@ static const struct amd_flash_info jedec_table[] = {
524 ERASEINFO(0x10000,8), 506 ERASEINFO(0x10000,8),
525 } 507 }
526 }, { 508 }, {
527 .mfr_id = MANUFACTURER_AMD, 509 .mfr_id = CFI_MFR_AMD,
528 .dev_id = AM29LV040B, 510 .dev_id = AM29LV040B,
529 .name = "AMD AM29LV040B", 511 .name = "AMD AM29LV040B",
530 .devtypes = CFI_DEVICETYPE_X8, 512 .devtypes = CFI_DEVICETYPE_X8,
@@ -536,7 +518,7 @@ static const struct amd_flash_info jedec_table[] = {
536 ERASEINFO(0x10000,8), 518 ERASEINFO(0x10000,8),
537 } 519 }
538 }, { 520 }, {
539 .mfr_id = MANUFACTURER_AMD, 521 .mfr_id = CFI_MFR_AMD,
540 .dev_id = AM29F002T, 522 .dev_id = AM29F002T,
541 .name = "AMD AM29F002T", 523 .name = "AMD AM29F002T",
542 .devtypes = CFI_DEVICETYPE_X8, 524 .devtypes = CFI_DEVICETYPE_X8,
@@ -551,7 +533,7 @@ static const struct amd_flash_info jedec_table[] = {
551 ERASEINFO(0x04000,1), 533 ERASEINFO(0x04000,1),
552 } 534 }
553 }, { 535 }, {
554 .mfr_id = MANUFACTURER_AMD, 536 .mfr_id = CFI_MFR_AMD,
555 .dev_id = AM29SL800DT, 537 .dev_id = AM29SL800DT,
556 .name = "AMD AM29SL800DT", 538 .name = "AMD AM29SL800DT",
557 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 539 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -566,7 +548,7 @@ static const struct amd_flash_info jedec_table[] = {
566 ERASEINFO(0x04000,1), 548 ERASEINFO(0x04000,1),
567 } 549 }
568 }, { 550 }, {
569 .mfr_id = MANUFACTURER_AMD, 551 .mfr_id = CFI_MFR_AMD,
570 .dev_id = AM29SL800DB, 552 .dev_id = AM29SL800DB,
571 .name = "AMD AM29SL800DB", 553 .name = "AMD AM29SL800DB",
572 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 554 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -581,7 +563,7 @@ static const struct amd_flash_info jedec_table[] = {
581 ERASEINFO(0x10000,15), 563 ERASEINFO(0x10000,15),
582 } 564 }
583 }, { 565 }, {
584 .mfr_id = MANUFACTURER_ATMEL, 566 .mfr_id = CFI_MFR_ATMEL,
585 .dev_id = AT49BV512, 567 .dev_id = AT49BV512,
586 .name = "Atmel AT49BV512", 568 .name = "Atmel AT49BV512",
587 .devtypes = CFI_DEVICETYPE_X8, 569 .devtypes = CFI_DEVICETYPE_X8,
@@ -593,7 +575,7 @@ static const struct amd_flash_info jedec_table[] = {
593 ERASEINFO(0x10000,1) 575 ERASEINFO(0x10000,1)
594 } 576 }
595 }, { 577 }, {
596 .mfr_id = MANUFACTURER_ATMEL, 578 .mfr_id = CFI_MFR_ATMEL,
597 .dev_id = AT29LV512, 579 .dev_id = AT29LV512,
598 .name = "Atmel AT29LV512", 580 .name = "Atmel AT29LV512",
599 .devtypes = CFI_DEVICETYPE_X8, 581 .devtypes = CFI_DEVICETYPE_X8,
@@ -606,7 +588,7 @@ static const struct amd_flash_info jedec_table[] = {
606 ERASEINFO(0x80,256) 588 ERASEINFO(0x80,256)
607 } 589 }
608 }, { 590 }, {
609 .mfr_id = MANUFACTURER_ATMEL, 591 .mfr_id = CFI_MFR_ATMEL,
610 .dev_id = AT49BV16X, 592 .dev_id = AT49BV16X,
611 .name = "Atmel AT49BV16X", 593 .name = "Atmel AT49BV16X",
612 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 594 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -619,7 +601,7 @@ static const struct amd_flash_info jedec_table[] = {
619 ERASEINFO(0x10000,31) 601 ERASEINFO(0x10000,31)
620 } 602 }
621 }, { 603 }, {
622 .mfr_id = MANUFACTURER_ATMEL, 604 .mfr_id = CFI_MFR_ATMEL,
623 .dev_id = AT49BV16XT, 605 .dev_id = AT49BV16XT,
624 .name = "Atmel AT49BV16XT", 606 .name = "Atmel AT49BV16XT",
625 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 607 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -632,7 +614,7 @@ static const struct amd_flash_info jedec_table[] = {
632 ERASEINFO(0x02000,8) 614 ERASEINFO(0x02000,8)
633 } 615 }
634 }, { 616 }, {
635 .mfr_id = MANUFACTURER_ATMEL, 617 .mfr_id = CFI_MFR_ATMEL,
636 .dev_id = AT49BV32X, 618 .dev_id = AT49BV32X,
637 .name = "Atmel AT49BV32X", 619 .name = "Atmel AT49BV32X",
638 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 620 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -645,7 +627,7 @@ static const struct amd_flash_info jedec_table[] = {
645 ERASEINFO(0x10000,63) 627 ERASEINFO(0x10000,63)
646 } 628 }
647 }, { 629 }, {
648 .mfr_id = MANUFACTURER_ATMEL, 630 .mfr_id = CFI_MFR_ATMEL,
649 .dev_id = AT49BV32XT, 631 .dev_id = AT49BV32XT,
650 .name = "Atmel AT49BV32XT", 632 .name = "Atmel AT49BV32XT",
651 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 633 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -658,7 +640,7 @@ static const struct amd_flash_info jedec_table[] = {
658 ERASEINFO(0x02000,8) 640 ERASEINFO(0x02000,8)
659 } 641 }
660 }, { 642 }, {
661 .mfr_id = MANUFACTURER_EON, 643 .mfr_id = CFI_MFR_EON,
662 .dev_id = EN29SL800BT, 644 .dev_id = EN29SL800BT,
663 .name = "Eon EN29SL800BT", 645 .name = "Eon EN29SL800BT",
664 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 646 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -673,7 +655,7 @@ static const struct amd_flash_info jedec_table[] = {
673 ERASEINFO(0x04000,1), 655 ERASEINFO(0x04000,1),
674 } 656 }
675 }, { 657 }, {
676 .mfr_id = MANUFACTURER_EON, 658 .mfr_id = CFI_MFR_EON,
677 .dev_id = EN29SL800BB, 659 .dev_id = EN29SL800BB,
678 .name = "Eon EN29SL800BB", 660 .name = "Eon EN29SL800BB",
679 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 661 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -688,7 +670,7 @@ static const struct amd_flash_info jedec_table[] = {
688 ERASEINFO(0x10000,15), 670 ERASEINFO(0x10000,15),
689 } 671 }
690 }, { 672 }, {
691 .mfr_id = MANUFACTURER_FUJITSU, 673 .mfr_id = CFI_MFR_FUJITSU,
692 .dev_id = MBM29F040C, 674 .dev_id = MBM29F040C,
693 .name = "Fujitsu MBM29F040C", 675 .name = "Fujitsu MBM29F040C",
694 .devtypes = CFI_DEVICETYPE_X8, 676 .devtypes = CFI_DEVICETYPE_X8,
@@ -700,7 +682,7 @@ static const struct amd_flash_info jedec_table[] = {
700 ERASEINFO(0x10000,8) 682 ERASEINFO(0x10000,8)
701 } 683 }
702 }, { 684 }, {
703 .mfr_id = MANUFACTURER_FUJITSU, 685 .mfr_id = CFI_MFR_FUJITSU,
704 .dev_id = MBM29F800BA, 686 .dev_id = MBM29F800BA,
705 .name = "Fujitsu MBM29F800BA", 687 .name = "Fujitsu MBM29F800BA",
706 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 688 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -715,7 +697,7 @@ static const struct amd_flash_info jedec_table[] = {
715 ERASEINFO(0x10000,15), 697 ERASEINFO(0x10000,15),
716 } 698 }
717 }, { 699 }, {
718 .mfr_id = MANUFACTURER_FUJITSU, 700 .mfr_id = CFI_MFR_FUJITSU,
719 .dev_id = MBM29LV650UE, 701 .dev_id = MBM29LV650UE,
720 .name = "Fujitsu MBM29LV650UE", 702 .name = "Fujitsu MBM29LV650UE",
721 .devtypes = CFI_DEVICETYPE_X8, 703 .devtypes = CFI_DEVICETYPE_X8,
@@ -727,7 +709,7 @@ static const struct amd_flash_info jedec_table[] = {
727 ERASEINFO(0x10000,128) 709 ERASEINFO(0x10000,128)
728 } 710 }
729 }, { 711 }, {
730 .mfr_id = MANUFACTURER_FUJITSU, 712 .mfr_id = CFI_MFR_FUJITSU,
731 .dev_id = MBM29LV320TE, 713 .dev_id = MBM29LV320TE,
732 .name = "Fujitsu MBM29LV320TE", 714 .name = "Fujitsu MBM29LV320TE",
733 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 715 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -740,7 +722,7 @@ static const struct amd_flash_info jedec_table[] = {
740 ERASEINFO(0x02000,8) 722 ERASEINFO(0x02000,8)
741 } 723 }
742 }, { 724 }, {
743 .mfr_id = MANUFACTURER_FUJITSU, 725 .mfr_id = CFI_MFR_FUJITSU,
744 .dev_id = MBM29LV320BE, 726 .dev_id = MBM29LV320BE,
745 .name = "Fujitsu MBM29LV320BE", 727 .name = "Fujitsu MBM29LV320BE",
746 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 728 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -753,7 +735,7 @@ static const struct amd_flash_info jedec_table[] = {
753 ERASEINFO(0x10000,63) 735 ERASEINFO(0x10000,63)
754 } 736 }
755 }, { 737 }, {
756 .mfr_id = MANUFACTURER_FUJITSU, 738 .mfr_id = CFI_MFR_FUJITSU,
757 .dev_id = MBM29LV160TE, 739 .dev_id = MBM29LV160TE,
758 .name = "Fujitsu MBM29LV160TE", 740 .name = "Fujitsu MBM29LV160TE",
759 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 741 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -768,7 +750,7 @@ static const struct amd_flash_info jedec_table[] = {
768 ERASEINFO(0x04000,1) 750 ERASEINFO(0x04000,1)
769 } 751 }
770 }, { 752 }, {
771 .mfr_id = MANUFACTURER_FUJITSU, 753 .mfr_id = CFI_MFR_FUJITSU,
772 .dev_id = MBM29LV160BE, 754 .dev_id = MBM29LV160BE,
773 .name = "Fujitsu MBM29LV160BE", 755 .name = "Fujitsu MBM29LV160BE",
774 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 756 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -783,7 +765,7 @@ static const struct amd_flash_info jedec_table[] = {
783 ERASEINFO(0x10000,31) 765 ERASEINFO(0x10000,31)
784 } 766 }
785 }, { 767 }, {
786 .mfr_id = MANUFACTURER_FUJITSU, 768 .mfr_id = CFI_MFR_FUJITSU,
787 .dev_id = MBM29LV800BA, 769 .dev_id = MBM29LV800BA,
788 .name = "Fujitsu MBM29LV800BA", 770 .name = "Fujitsu MBM29LV800BA",
789 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 771 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -798,7 +780,7 @@ static const struct amd_flash_info jedec_table[] = {
798 ERASEINFO(0x10000,15) 780 ERASEINFO(0x10000,15)
799 } 781 }
800 }, { 782 }, {
801 .mfr_id = MANUFACTURER_FUJITSU, 783 .mfr_id = CFI_MFR_FUJITSU,
802 .dev_id = MBM29LV800TA, 784 .dev_id = MBM29LV800TA,
803 .name = "Fujitsu MBM29LV800TA", 785 .name = "Fujitsu MBM29LV800TA",
804 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 786 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -813,7 +795,7 @@ static const struct amd_flash_info jedec_table[] = {
813 ERASEINFO(0x04000,1) 795 ERASEINFO(0x04000,1)
814 } 796 }
815 }, { 797 }, {
816 .mfr_id = MANUFACTURER_FUJITSU, 798 .mfr_id = CFI_MFR_FUJITSU,
817 .dev_id = MBM29LV400BC, 799 .dev_id = MBM29LV400BC,
818 .name = "Fujitsu MBM29LV400BC", 800 .name = "Fujitsu MBM29LV400BC",
819 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 801 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -828,7 +810,7 @@ static const struct amd_flash_info jedec_table[] = {
828 ERASEINFO(0x10000,7) 810 ERASEINFO(0x10000,7)
829 } 811 }
830 }, { 812 }, {
831 .mfr_id = MANUFACTURER_FUJITSU, 813 .mfr_id = CFI_MFR_FUJITSU,
832 .dev_id = MBM29LV400TC, 814 .dev_id = MBM29LV400TC,
833 .name = "Fujitsu MBM29LV400TC", 815 .name = "Fujitsu MBM29LV400TC",
834 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 816 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -843,7 +825,7 @@ static const struct amd_flash_info jedec_table[] = {
843 ERASEINFO(0x04000,1) 825 ERASEINFO(0x04000,1)
844 } 826 }
845 }, { 827 }, {
846 .mfr_id = MANUFACTURER_HYUNDAI, 828 .mfr_id = CFI_MFR_HYUNDAI,
847 .dev_id = HY29F002T, 829 .dev_id = HY29F002T,
848 .name = "Hyundai HY29F002T", 830 .name = "Hyundai HY29F002T",
849 .devtypes = CFI_DEVICETYPE_X8, 831 .devtypes = CFI_DEVICETYPE_X8,
@@ -858,7 +840,7 @@ static const struct amd_flash_info jedec_table[] = {
858 ERASEINFO(0x04000,1), 840 ERASEINFO(0x04000,1),
859 } 841 }
860 }, { 842 }, {
861 .mfr_id = MANUFACTURER_INTEL, 843 .mfr_id = CFI_MFR_INTEL,
862 .dev_id = I28F004B3B, 844 .dev_id = I28F004B3B,
863 .name = "Intel 28F004B3B", 845 .name = "Intel 28F004B3B",
864 .devtypes = CFI_DEVICETYPE_X8, 846 .devtypes = CFI_DEVICETYPE_X8,
@@ -871,7 +853,7 @@ static const struct amd_flash_info jedec_table[] = {
871 ERASEINFO(0x10000, 7), 853 ERASEINFO(0x10000, 7),
872 } 854 }
873 }, { 855 }, {
874 .mfr_id = MANUFACTURER_INTEL, 856 .mfr_id = CFI_MFR_INTEL,
875 .dev_id = I28F004B3T, 857 .dev_id = I28F004B3T,
876 .name = "Intel 28F004B3T", 858 .name = "Intel 28F004B3T",
877 .devtypes = CFI_DEVICETYPE_X8, 859 .devtypes = CFI_DEVICETYPE_X8,
@@ -884,7 +866,7 @@ static const struct amd_flash_info jedec_table[] = {
884 ERASEINFO(0x02000, 8), 866 ERASEINFO(0x02000, 8),
885 } 867 }
886 }, { 868 }, {
887 .mfr_id = MANUFACTURER_INTEL, 869 .mfr_id = CFI_MFR_INTEL,
888 .dev_id = I28F400B3B, 870 .dev_id = I28F400B3B,
889 .name = "Intel 28F400B3B", 871 .name = "Intel 28F400B3B",
890 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 872 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -897,7 +879,7 @@ static const struct amd_flash_info jedec_table[] = {
897 ERASEINFO(0x10000, 7), 879 ERASEINFO(0x10000, 7),
898 } 880 }
899 }, { 881 }, {
900 .mfr_id = MANUFACTURER_INTEL, 882 .mfr_id = CFI_MFR_INTEL,
901 .dev_id = I28F400B3T, 883 .dev_id = I28F400B3T,
902 .name = "Intel 28F400B3T", 884 .name = "Intel 28F400B3T",
903 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 885 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -910,7 +892,7 @@ static const struct amd_flash_info jedec_table[] = {
910 ERASEINFO(0x02000, 8), 892 ERASEINFO(0x02000, 8),
911 } 893 }
912 }, { 894 }, {
913 .mfr_id = MANUFACTURER_INTEL, 895 .mfr_id = CFI_MFR_INTEL,
914 .dev_id = I28F008B3B, 896 .dev_id = I28F008B3B,
915 .name = "Intel 28F008B3B", 897 .name = "Intel 28F008B3B",
916 .devtypes = CFI_DEVICETYPE_X8, 898 .devtypes = CFI_DEVICETYPE_X8,
@@ -923,7 +905,7 @@ static const struct amd_flash_info jedec_table[] = {
923 ERASEINFO(0x10000, 15), 905 ERASEINFO(0x10000, 15),
924 } 906 }
925 }, { 907 }, {
926 .mfr_id = MANUFACTURER_INTEL, 908 .mfr_id = CFI_MFR_INTEL,
927 .dev_id = I28F008B3T, 909 .dev_id = I28F008B3T,
928 .name = "Intel 28F008B3T", 910 .name = "Intel 28F008B3T",
929 .devtypes = CFI_DEVICETYPE_X8, 911 .devtypes = CFI_DEVICETYPE_X8,
@@ -936,7 +918,7 @@ static const struct amd_flash_info jedec_table[] = {
936 ERASEINFO(0x02000, 8), 918 ERASEINFO(0x02000, 8),
937 } 919 }
938 }, { 920 }, {
939 .mfr_id = MANUFACTURER_INTEL, 921 .mfr_id = CFI_MFR_INTEL,
940 .dev_id = I28F008S5, 922 .dev_id = I28F008S5,
941 .name = "Intel 28F008S5", 923 .name = "Intel 28F008S5",
942 .devtypes = CFI_DEVICETYPE_X8, 924 .devtypes = CFI_DEVICETYPE_X8,
@@ -948,7 +930,7 @@ static const struct amd_flash_info jedec_table[] = {
948 ERASEINFO(0x10000,16), 930 ERASEINFO(0x10000,16),
949 } 931 }
950 }, { 932 }, {
951 .mfr_id = MANUFACTURER_INTEL, 933 .mfr_id = CFI_MFR_INTEL,
952 .dev_id = I28F016S5, 934 .dev_id = I28F016S5,
953 .name = "Intel 28F016S5", 935 .name = "Intel 28F016S5",
954 .devtypes = CFI_DEVICETYPE_X8, 936 .devtypes = CFI_DEVICETYPE_X8,
@@ -960,7 +942,7 @@ static const struct amd_flash_info jedec_table[] = {
960 ERASEINFO(0x10000,32), 942 ERASEINFO(0x10000,32),
961 } 943 }
962 }, { 944 }, {
963 .mfr_id = MANUFACTURER_INTEL, 945 .mfr_id = CFI_MFR_INTEL,
964 .dev_id = I28F008SA, 946 .dev_id = I28F008SA,
965 .name = "Intel 28F008SA", 947 .name = "Intel 28F008SA",
966 .devtypes = CFI_DEVICETYPE_X8, 948 .devtypes = CFI_DEVICETYPE_X8,
@@ -972,7 +954,7 @@ static const struct amd_flash_info jedec_table[] = {
972 ERASEINFO(0x10000, 16), 954 ERASEINFO(0x10000, 16),
973 } 955 }
974 }, { 956 }, {
975 .mfr_id = MANUFACTURER_INTEL, 957 .mfr_id = CFI_MFR_INTEL,
976 .dev_id = I28F800B3B, 958 .dev_id = I28F800B3B,
977 .name = "Intel 28F800B3B", 959 .name = "Intel 28F800B3B",
978 .devtypes = CFI_DEVICETYPE_X16, 960 .devtypes = CFI_DEVICETYPE_X16,
@@ -985,7 +967,7 @@ static const struct amd_flash_info jedec_table[] = {
985 ERASEINFO(0x10000, 15), 967 ERASEINFO(0x10000, 15),
986 } 968 }
987 }, { 969 }, {
988 .mfr_id = MANUFACTURER_INTEL, 970 .mfr_id = CFI_MFR_INTEL,
989 .dev_id = I28F800B3T, 971 .dev_id = I28F800B3T,
990 .name = "Intel 28F800B3T", 972 .name = "Intel 28F800B3T",
991 .devtypes = CFI_DEVICETYPE_X16, 973 .devtypes = CFI_DEVICETYPE_X16,
@@ -998,7 +980,7 @@ static const struct amd_flash_info jedec_table[] = {
998 ERASEINFO(0x02000, 8), 980 ERASEINFO(0x02000, 8),
999 } 981 }
1000 }, { 982 }, {
1001 .mfr_id = MANUFACTURER_INTEL, 983 .mfr_id = CFI_MFR_INTEL,
1002 .dev_id = I28F016B3B, 984 .dev_id = I28F016B3B,
1003 .name = "Intel 28F016B3B", 985 .name = "Intel 28F016B3B",
1004 .devtypes = CFI_DEVICETYPE_X8, 986 .devtypes = CFI_DEVICETYPE_X8,
@@ -1011,7 +993,7 @@ static const struct amd_flash_info jedec_table[] = {
1011 ERASEINFO(0x10000, 31), 993 ERASEINFO(0x10000, 31),
1012 } 994 }
1013 }, { 995 }, {
1014 .mfr_id = MANUFACTURER_INTEL, 996 .mfr_id = CFI_MFR_INTEL,
1015 .dev_id = I28F016S3, 997 .dev_id = I28F016S3,
1016 .name = "Intel I28F016S3", 998 .name = "Intel I28F016S3",
1017 .devtypes = CFI_DEVICETYPE_X8, 999 .devtypes = CFI_DEVICETYPE_X8,
@@ -1023,7 +1005,7 @@ static const struct amd_flash_info jedec_table[] = {
1023 ERASEINFO(0x10000, 32), 1005 ERASEINFO(0x10000, 32),
1024 } 1006 }
1025 }, { 1007 }, {
1026 .mfr_id = MANUFACTURER_INTEL, 1008 .mfr_id = CFI_MFR_INTEL,
1027 .dev_id = I28F016B3T, 1009 .dev_id = I28F016B3T,
1028 .name = "Intel 28F016B3T", 1010 .name = "Intel 28F016B3T",
1029 .devtypes = CFI_DEVICETYPE_X8, 1011 .devtypes = CFI_DEVICETYPE_X8,
@@ -1036,7 +1018,7 @@ static const struct amd_flash_info jedec_table[] = {
1036 ERASEINFO(0x02000, 8), 1018 ERASEINFO(0x02000, 8),
1037 } 1019 }
1038 }, { 1020 }, {
1039 .mfr_id = MANUFACTURER_INTEL, 1021 .mfr_id = CFI_MFR_INTEL,
1040 .dev_id = I28F160B3B, 1022 .dev_id = I28F160B3B,
1041 .name = "Intel 28F160B3B", 1023 .name = "Intel 28F160B3B",
1042 .devtypes = CFI_DEVICETYPE_X16, 1024 .devtypes = CFI_DEVICETYPE_X16,
@@ -1049,7 +1031,7 @@ static const struct amd_flash_info jedec_table[] = {
1049 ERASEINFO(0x10000, 31), 1031 ERASEINFO(0x10000, 31),
1050 } 1032 }
1051 }, { 1033 }, {
1052 .mfr_id = MANUFACTURER_INTEL, 1034 .mfr_id = CFI_MFR_INTEL,
1053 .dev_id = I28F160B3T, 1035 .dev_id = I28F160B3T,
1054 .name = "Intel 28F160B3T", 1036 .name = "Intel 28F160B3T",
1055 .devtypes = CFI_DEVICETYPE_X16, 1037 .devtypes = CFI_DEVICETYPE_X16,
@@ -1062,7 +1044,7 @@ static const struct amd_flash_info jedec_table[] = {
1062 ERASEINFO(0x02000, 8), 1044 ERASEINFO(0x02000, 8),
1063 } 1045 }
1064 }, { 1046 }, {
1065 .mfr_id = MANUFACTURER_INTEL, 1047 .mfr_id = CFI_MFR_INTEL,
1066 .dev_id = I28F320B3B, 1048 .dev_id = I28F320B3B,
1067 .name = "Intel 28F320B3B", 1049 .name = "Intel 28F320B3B",
1068 .devtypes = CFI_DEVICETYPE_X16, 1050 .devtypes = CFI_DEVICETYPE_X16,
@@ -1075,7 +1057,7 @@ static const struct amd_flash_info jedec_table[] = {
1075 ERASEINFO(0x10000, 63), 1057 ERASEINFO(0x10000, 63),
1076 } 1058 }
1077 }, { 1059 }, {
1078 .mfr_id = MANUFACTURER_INTEL, 1060 .mfr_id = CFI_MFR_INTEL,
1079 .dev_id = I28F320B3T, 1061 .dev_id = I28F320B3T,
1080 .name = "Intel 28F320B3T", 1062 .name = "Intel 28F320B3T",
1081 .devtypes = CFI_DEVICETYPE_X16, 1063 .devtypes = CFI_DEVICETYPE_X16,
@@ -1088,7 +1070,7 @@ static const struct amd_flash_info jedec_table[] = {
1088 ERASEINFO(0x02000, 8), 1070 ERASEINFO(0x02000, 8),
1089 } 1071 }
1090 }, { 1072 }, {
1091 .mfr_id = MANUFACTURER_INTEL, 1073 .mfr_id = CFI_MFR_INTEL,
1092 .dev_id = I28F640B3B, 1074 .dev_id = I28F640B3B,
1093 .name = "Intel 28F640B3B", 1075 .name = "Intel 28F640B3B",
1094 .devtypes = CFI_DEVICETYPE_X16, 1076 .devtypes = CFI_DEVICETYPE_X16,
@@ -1101,7 +1083,7 @@ static const struct amd_flash_info jedec_table[] = {
1101 ERASEINFO(0x10000, 127), 1083 ERASEINFO(0x10000, 127),
1102 } 1084 }
1103 }, { 1085 }, {
1104 .mfr_id = MANUFACTURER_INTEL, 1086 .mfr_id = CFI_MFR_INTEL,
1105 .dev_id = I28F640B3T, 1087 .dev_id = I28F640B3T,
1106 .name = "Intel 28F640B3T", 1088 .name = "Intel 28F640B3T",
1107 .devtypes = CFI_DEVICETYPE_X16, 1089 .devtypes = CFI_DEVICETYPE_X16,
@@ -1114,7 +1096,7 @@ static const struct amd_flash_info jedec_table[] = {
1114 ERASEINFO(0x02000, 8), 1096 ERASEINFO(0x02000, 8),
1115 } 1097 }
1116 }, { 1098 }, {
1117 .mfr_id = MANUFACTURER_INTEL, 1099 .mfr_id = CFI_MFR_INTEL,
1118 .dev_id = I28F640C3B, 1100 .dev_id = I28F640C3B,
1119 .name = "Intel 28F640C3B", 1101 .name = "Intel 28F640C3B",
1120 .devtypes = CFI_DEVICETYPE_X16, 1102 .devtypes = CFI_DEVICETYPE_X16,
@@ -1127,7 +1109,7 @@ static const struct amd_flash_info jedec_table[] = {
1127 ERASEINFO(0x10000, 127), 1109 ERASEINFO(0x10000, 127),
1128 } 1110 }
1129 }, { 1111 }, {
1130 .mfr_id = MANUFACTURER_INTEL, 1112 .mfr_id = CFI_MFR_INTEL,
1131 .dev_id = I82802AB, 1113 .dev_id = I82802AB,
1132 .name = "Intel 82802AB", 1114 .name = "Intel 82802AB",
1133 .devtypes = CFI_DEVICETYPE_X8, 1115 .devtypes = CFI_DEVICETYPE_X8,
@@ -1139,7 +1121,7 @@ static const struct amd_flash_info jedec_table[] = {
1139 ERASEINFO(0x10000,8), 1121 ERASEINFO(0x10000,8),
1140 } 1122 }
1141 }, { 1123 }, {
1142 .mfr_id = MANUFACTURER_INTEL, 1124 .mfr_id = CFI_MFR_INTEL,
1143 .dev_id = I82802AC, 1125 .dev_id = I82802AC,
1144 .name = "Intel 82802AC", 1126 .name = "Intel 82802AC",
1145 .devtypes = CFI_DEVICETYPE_X8, 1127 .devtypes = CFI_DEVICETYPE_X8,
@@ -1151,7 +1133,7 @@ static const struct amd_flash_info jedec_table[] = {
1151 ERASEINFO(0x10000,16), 1133 ERASEINFO(0x10000,16),
1152 } 1134 }
1153 }, { 1135 }, {
1154 .mfr_id = MANUFACTURER_MACRONIX, 1136 .mfr_id = CFI_MFR_MACRONIX,
1155 .dev_id = MX29LV040C, 1137 .dev_id = MX29LV040C,
1156 .name = "Macronix MX29LV040C", 1138 .name = "Macronix MX29LV040C",
1157 .devtypes = CFI_DEVICETYPE_X8, 1139 .devtypes = CFI_DEVICETYPE_X8,
@@ -1163,7 +1145,7 @@ static const struct amd_flash_info jedec_table[] = {
1163 ERASEINFO(0x10000,8), 1145 ERASEINFO(0x10000,8),
1164 } 1146 }
1165 }, { 1147 }, {
1166 .mfr_id = MANUFACTURER_MACRONIX, 1148 .mfr_id = CFI_MFR_MACRONIX,
1167 .dev_id = MX29LV160T, 1149 .dev_id = MX29LV160T,
1168 .name = "MXIC MX29LV160T", 1150 .name = "MXIC MX29LV160T",
1169 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1151 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1178,7 +1160,7 @@ static const struct amd_flash_info jedec_table[] = {
1178 ERASEINFO(0x04000,1) 1160 ERASEINFO(0x04000,1)
1179 } 1161 }
1180 }, { 1162 }, {
1181 .mfr_id = MANUFACTURER_NEC, 1163 .mfr_id = CFI_MFR_NEC,
1182 .dev_id = UPD29F064115, 1164 .dev_id = UPD29F064115,
1183 .name = "NEC uPD29F064115", 1165 .name = "NEC uPD29F064115",
1184 .devtypes = CFI_DEVICETYPE_X16, 1166 .devtypes = CFI_DEVICETYPE_X16,
@@ -1192,7 +1174,7 @@ static const struct amd_flash_info jedec_table[] = {
1192 ERASEINFO(0x2000,8), 1174 ERASEINFO(0x2000,8),
1193 } 1175 }
1194 }, { 1176 }, {
1195 .mfr_id = MANUFACTURER_MACRONIX, 1177 .mfr_id = CFI_MFR_MACRONIX,
1196 .dev_id = MX29LV160B, 1178 .dev_id = MX29LV160B,
1197 .name = "MXIC MX29LV160B", 1179 .name = "MXIC MX29LV160B",
1198 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1180 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1207,7 +1189,7 @@ static const struct amd_flash_info jedec_table[] = {
1207 ERASEINFO(0x10000,31) 1189 ERASEINFO(0x10000,31)
1208 } 1190 }
1209 }, { 1191 }, {
1210 .mfr_id = MANUFACTURER_MACRONIX, 1192 .mfr_id = CFI_MFR_MACRONIX,
1211 .dev_id = MX29F040, 1193 .dev_id = MX29F040,
1212 .name = "Macronix MX29F040", 1194 .name = "Macronix MX29F040",
1213 .devtypes = CFI_DEVICETYPE_X8, 1195 .devtypes = CFI_DEVICETYPE_X8,
@@ -1219,7 +1201,7 @@ static const struct amd_flash_info jedec_table[] = {
1219 ERASEINFO(0x10000,8), 1201 ERASEINFO(0x10000,8),
1220 } 1202 }
1221 }, { 1203 }, {
1222 .mfr_id = MANUFACTURER_MACRONIX, 1204 .mfr_id = CFI_MFR_MACRONIX,
1223 .dev_id = MX29F016, 1205 .dev_id = MX29F016,
1224 .name = "Macronix MX29F016", 1206 .name = "Macronix MX29F016",
1225 .devtypes = CFI_DEVICETYPE_X8, 1207 .devtypes = CFI_DEVICETYPE_X8,
@@ -1231,7 +1213,7 @@ static const struct amd_flash_info jedec_table[] = {
1231 ERASEINFO(0x10000,32), 1213 ERASEINFO(0x10000,32),
1232 } 1214 }
1233 }, { 1215 }, {
1234 .mfr_id = MANUFACTURER_MACRONIX, 1216 .mfr_id = CFI_MFR_MACRONIX,
1235 .dev_id = MX29F004T, 1217 .dev_id = MX29F004T,
1236 .name = "Macronix MX29F004T", 1218 .name = "Macronix MX29F004T",
1237 .devtypes = CFI_DEVICETYPE_X8, 1219 .devtypes = CFI_DEVICETYPE_X8,
@@ -1246,7 +1228,7 @@ static const struct amd_flash_info jedec_table[] = {
1246 ERASEINFO(0x04000,1), 1228 ERASEINFO(0x04000,1),
1247 } 1229 }
1248 }, { 1230 }, {
1249 .mfr_id = MANUFACTURER_MACRONIX, 1231 .mfr_id = CFI_MFR_MACRONIX,
1250 .dev_id = MX29F004B, 1232 .dev_id = MX29F004B,
1251 .name = "Macronix MX29F004B", 1233 .name = "Macronix MX29F004B",
1252 .devtypes = CFI_DEVICETYPE_X8, 1234 .devtypes = CFI_DEVICETYPE_X8,
@@ -1261,7 +1243,7 @@ static const struct amd_flash_info jedec_table[] = {
1261 ERASEINFO(0x10000,7), 1243 ERASEINFO(0x10000,7),
1262 } 1244 }
1263 }, { 1245 }, {
1264 .mfr_id = MANUFACTURER_MACRONIX, 1246 .mfr_id = CFI_MFR_MACRONIX,
1265 .dev_id = MX29F002T, 1247 .dev_id = MX29F002T,
1266 .name = "Macronix MX29F002T", 1248 .name = "Macronix MX29F002T",
1267 .devtypes = CFI_DEVICETYPE_X8, 1249 .devtypes = CFI_DEVICETYPE_X8,
@@ -1276,7 +1258,7 @@ static const struct amd_flash_info jedec_table[] = {
1276 ERASEINFO(0x04000,1), 1258 ERASEINFO(0x04000,1),
1277 } 1259 }
1278 }, { 1260 }, {
1279 .mfr_id = MANUFACTURER_PMC, 1261 .mfr_id = CFI_MFR_PMC,
1280 .dev_id = PM49FL002, 1262 .dev_id = PM49FL002,
1281 .name = "PMC Pm49FL002", 1263 .name = "PMC Pm49FL002",
1282 .devtypes = CFI_DEVICETYPE_X8, 1264 .devtypes = CFI_DEVICETYPE_X8,
@@ -1288,7 +1270,7 @@ static const struct amd_flash_info jedec_table[] = {
1288 ERASEINFO( 0x01000, 64 ) 1270 ERASEINFO( 0x01000, 64 )
1289 } 1271 }
1290 }, { 1272 }, {
1291 .mfr_id = MANUFACTURER_PMC, 1273 .mfr_id = CFI_MFR_PMC,
1292 .dev_id = PM49FL004, 1274 .dev_id = PM49FL004,
1293 .name = "PMC Pm49FL004", 1275 .name = "PMC Pm49FL004",
1294 .devtypes = CFI_DEVICETYPE_X8, 1276 .devtypes = CFI_DEVICETYPE_X8,
@@ -1300,7 +1282,7 @@ static const struct amd_flash_info jedec_table[] = {
1300 ERASEINFO( 0x01000, 128 ) 1282 ERASEINFO( 0x01000, 128 )
1301 } 1283 }
1302 }, { 1284 }, {
1303 .mfr_id = MANUFACTURER_PMC, 1285 .mfr_id = CFI_MFR_PMC,
1304 .dev_id = PM49FL008, 1286 .dev_id = PM49FL008,
1305 .name = "PMC Pm49FL008", 1287 .name = "PMC Pm49FL008",
1306 .devtypes = CFI_DEVICETYPE_X8, 1288 .devtypes = CFI_DEVICETYPE_X8,
@@ -1312,7 +1294,7 @@ static const struct amd_flash_info jedec_table[] = {
1312 ERASEINFO( 0x01000, 256 ) 1294 ERASEINFO( 0x01000, 256 )
1313 } 1295 }
1314 }, { 1296 }, {
1315 .mfr_id = MANUFACTURER_SHARP, 1297 .mfr_id = CFI_MFR_SHARP,
1316 .dev_id = LH28F640BF, 1298 .dev_id = LH28F640BF,
1317 .name = "LH28F640BF", 1299 .name = "LH28F640BF",
1318 .devtypes = CFI_DEVICETYPE_X8, 1300 .devtypes = CFI_DEVICETYPE_X8,
@@ -1324,7 +1306,7 @@ static const struct amd_flash_info jedec_table[] = {
1324 ERASEINFO(0x40000,16), 1306 ERASEINFO(0x40000,16),
1325 } 1307 }
1326 }, { 1308 }, {
1327 .mfr_id = MANUFACTURER_SST, 1309 .mfr_id = CFI_MFR_SST,
1328 .dev_id = SST39LF512, 1310 .dev_id = SST39LF512,
1329 .name = "SST 39LF512", 1311 .name = "SST 39LF512",
1330 .devtypes = CFI_DEVICETYPE_X8, 1312 .devtypes = CFI_DEVICETYPE_X8,
@@ -1336,7 +1318,7 @@ static const struct amd_flash_info jedec_table[] = {
1336 ERASEINFO(0x01000,16), 1318 ERASEINFO(0x01000,16),
1337 } 1319 }
1338 }, { 1320 }, {
1339 .mfr_id = MANUFACTURER_SST, 1321 .mfr_id = CFI_MFR_SST,
1340 .dev_id = SST39LF010, 1322 .dev_id = SST39LF010,
1341 .name = "SST 39LF010", 1323 .name = "SST 39LF010",
1342 .devtypes = CFI_DEVICETYPE_X8, 1324 .devtypes = CFI_DEVICETYPE_X8,
@@ -1348,7 +1330,7 @@ static const struct amd_flash_info jedec_table[] = {
1348 ERASEINFO(0x01000,32), 1330 ERASEINFO(0x01000,32),
1349 } 1331 }
1350 }, { 1332 }, {
1351 .mfr_id = MANUFACTURER_SST, 1333 .mfr_id = CFI_MFR_SST,
1352 .dev_id = SST29EE020, 1334 .dev_id = SST29EE020,
1353 .name = "SST 29EE020", 1335 .name = "SST 29EE020",
1354 .devtypes = CFI_DEVICETYPE_X8, 1336 .devtypes = CFI_DEVICETYPE_X8,
@@ -1359,7 +1341,7 @@ static const struct amd_flash_info jedec_table[] = {
1359 .regions = {ERASEINFO(0x01000,64), 1341 .regions = {ERASEINFO(0x01000,64),
1360 } 1342 }
1361 }, { 1343 }, {
1362 .mfr_id = MANUFACTURER_SST, 1344 .mfr_id = CFI_MFR_SST,
1363 .dev_id = SST29LE020, 1345 .dev_id = SST29LE020,
1364 .name = "SST 29LE020", 1346 .name = "SST 29LE020",
1365 .devtypes = CFI_DEVICETYPE_X8, 1347 .devtypes = CFI_DEVICETYPE_X8,
@@ -1370,7 +1352,7 @@ static const struct amd_flash_info jedec_table[] = {
1370 .regions = {ERASEINFO(0x01000,64), 1352 .regions = {ERASEINFO(0x01000,64),
1371 } 1353 }
1372 }, { 1354 }, {
1373 .mfr_id = MANUFACTURER_SST, 1355 .mfr_id = CFI_MFR_SST,
1374 .dev_id = SST39LF020, 1356 .dev_id = SST39LF020,
1375 .name = "SST 39LF020", 1357 .name = "SST 39LF020",
1376 .devtypes = CFI_DEVICETYPE_X8, 1358 .devtypes = CFI_DEVICETYPE_X8,
@@ -1382,7 +1364,7 @@ static const struct amd_flash_info jedec_table[] = {
1382 ERASEINFO(0x01000,64), 1364 ERASEINFO(0x01000,64),
1383 } 1365 }
1384 }, { 1366 }, {
1385 .mfr_id = MANUFACTURER_SST, 1367 .mfr_id = CFI_MFR_SST,
1386 .dev_id = SST39LF040, 1368 .dev_id = SST39LF040,
1387 .name = "SST 39LF040", 1369 .name = "SST 39LF040",
1388 .devtypes = CFI_DEVICETYPE_X8, 1370 .devtypes = CFI_DEVICETYPE_X8,
@@ -1394,7 +1376,7 @@ static const struct amd_flash_info jedec_table[] = {
1394 ERASEINFO(0x01000,128), 1376 ERASEINFO(0x01000,128),
1395 } 1377 }
1396 }, { 1378 }, {
1397 .mfr_id = MANUFACTURER_SST, 1379 .mfr_id = CFI_MFR_SST,
1398 .dev_id = SST39SF010A, 1380 .dev_id = SST39SF010A,
1399 .name = "SST 39SF010A", 1381 .name = "SST 39SF010A",
1400 .devtypes = CFI_DEVICETYPE_X8, 1382 .devtypes = CFI_DEVICETYPE_X8,
@@ -1406,7 +1388,7 @@ static const struct amd_flash_info jedec_table[] = {
1406 ERASEINFO(0x01000,32), 1388 ERASEINFO(0x01000,32),
1407 } 1389 }
1408 }, { 1390 }, {
1409 .mfr_id = MANUFACTURER_SST, 1391 .mfr_id = CFI_MFR_SST,
1410 .dev_id = SST39SF020A, 1392 .dev_id = SST39SF020A,
1411 .name = "SST 39SF020A", 1393 .name = "SST 39SF020A",
1412 .devtypes = CFI_DEVICETYPE_X8, 1394 .devtypes = CFI_DEVICETYPE_X8,
@@ -1418,7 +1400,7 @@ static const struct amd_flash_info jedec_table[] = {
1418 ERASEINFO(0x01000,64), 1400 ERASEINFO(0x01000,64),
1419 } 1401 }
1420 }, { 1402 }, {
1421 .mfr_id = MANUFACTURER_SST, 1403 .mfr_id = CFI_MFR_SST,
1422 .dev_id = SST39SF040, 1404 .dev_id = SST39SF040,
1423 .name = "SST 39SF040", 1405 .name = "SST 39SF040",
1424 .devtypes = CFI_DEVICETYPE_X8, 1406 .devtypes = CFI_DEVICETYPE_X8,
@@ -1430,7 +1412,7 @@ static const struct amd_flash_info jedec_table[] = {
1430 ERASEINFO(0x01000,128), 1412 ERASEINFO(0x01000,128),
1431 } 1413 }
1432 }, { 1414 }, {
1433 .mfr_id = MANUFACTURER_SST, 1415 .mfr_id = CFI_MFR_SST,
1434 .dev_id = SST49LF040B, 1416 .dev_id = SST49LF040B,
1435 .name = "SST 49LF040B", 1417 .name = "SST 49LF040B",
1436 .devtypes = CFI_DEVICETYPE_X8, 1418 .devtypes = CFI_DEVICETYPE_X8,
@@ -1443,7 +1425,7 @@ static const struct amd_flash_info jedec_table[] = {
1443 } 1425 }
1444 }, { 1426 }, {
1445 1427
1446 .mfr_id = MANUFACTURER_SST, 1428 .mfr_id = CFI_MFR_SST,
1447 .dev_id = SST49LF004B, 1429 .dev_id = SST49LF004B,
1448 .name = "SST 49LF004B", 1430 .name = "SST 49LF004B",
1449 .devtypes = CFI_DEVICETYPE_X8, 1431 .devtypes = CFI_DEVICETYPE_X8,
@@ -1455,7 +1437,7 @@ static const struct amd_flash_info jedec_table[] = {
1455 ERASEINFO(0x01000,128), 1437 ERASEINFO(0x01000,128),
1456 } 1438 }
1457 }, { 1439 }, {
1458 .mfr_id = MANUFACTURER_SST, 1440 .mfr_id = CFI_MFR_SST,
1459 .dev_id = SST49LF008A, 1441 .dev_id = SST49LF008A,
1460 .name = "SST 49LF008A", 1442 .name = "SST 49LF008A",
1461 .devtypes = CFI_DEVICETYPE_X8, 1443 .devtypes = CFI_DEVICETYPE_X8,
@@ -1467,7 +1449,7 @@ static const struct amd_flash_info jedec_table[] = {
1467 ERASEINFO(0x01000,256), 1449 ERASEINFO(0x01000,256),
1468 } 1450 }
1469 }, { 1451 }, {
1470 .mfr_id = MANUFACTURER_SST, 1452 .mfr_id = CFI_MFR_SST,
1471 .dev_id = SST49LF030A, 1453 .dev_id = SST49LF030A,
1472 .name = "SST 49LF030A", 1454 .name = "SST 49LF030A",
1473 .devtypes = CFI_DEVICETYPE_X8, 1455 .devtypes = CFI_DEVICETYPE_X8,
@@ -1479,7 +1461,7 @@ static const struct amd_flash_info jedec_table[] = {
1479 ERASEINFO(0x01000,96), 1461 ERASEINFO(0x01000,96),
1480 } 1462 }
1481 }, { 1463 }, {
1482 .mfr_id = MANUFACTURER_SST, 1464 .mfr_id = CFI_MFR_SST,
1483 .dev_id = SST49LF040A, 1465 .dev_id = SST49LF040A,
1484 .name = "SST 49LF040A", 1466 .name = "SST 49LF040A",
1485 .devtypes = CFI_DEVICETYPE_X8, 1467 .devtypes = CFI_DEVICETYPE_X8,
@@ -1491,7 +1473,7 @@ static const struct amd_flash_info jedec_table[] = {
1491 ERASEINFO(0x01000,128), 1473 ERASEINFO(0x01000,128),
1492 } 1474 }
1493 }, { 1475 }, {
1494 .mfr_id = MANUFACTURER_SST, 1476 .mfr_id = CFI_MFR_SST,
1495 .dev_id = SST49LF080A, 1477 .dev_id = SST49LF080A,
1496 .name = "SST 49LF080A", 1478 .name = "SST 49LF080A",
1497 .devtypes = CFI_DEVICETYPE_X8, 1479 .devtypes = CFI_DEVICETYPE_X8,
@@ -1503,7 +1485,7 @@ static const struct amd_flash_info jedec_table[] = {
1503 ERASEINFO(0x01000,256), 1485 ERASEINFO(0x01000,256),
1504 } 1486 }
1505 }, { 1487 }, {
1506 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1488 .mfr_id = CFI_MFR_SST, /* should be CFI */
1507 .dev_id = SST39LF160, 1489 .dev_id = SST39LF160,
1508 .name = "SST 39LF160", 1490 .name = "SST 39LF160",
1509 .devtypes = CFI_DEVICETYPE_X16, 1491 .devtypes = CFI_DEVICETYPE_X16,
@@ -1516,7 +1498,7 @@ static const struct amd_flash_info jedec_table[] = {
1516 ERASEINFO(0x1000,256) 1498 ERASEINFO(0x1000,256)
1517 } 1499 }
1518 }, { 1500 }, {
1519 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1501 .mfr_id = CFI_MFR_SST, /* should be CFI */
1520 .dev_id = SST39VF1601, 1502 .dev_id = SST39VF1601,
1521 .name = "SST 39VF1601", 1503 .name = "SST 39VF1601",
1522 .devtypes = CFI_DEVICETYPE_X16, 1504 .devtypes = CFI_DEVICETYPE_X16,
@@ -1529,7 +1511,7 @@ static const struct amd_flash_info jedec_table[] = {
1529 ERASEINFO(0x1000,256) 1511 ERASEINFO(0x1000,256)
1530 } 1512 }
1531 }, { 1513 }, {
1532 .mfr_id = MANUFACTURER_SST, /* should be CFI */ 1514 .mfr_id = CFI_MFR_SST, /* should be CFI */
1533 .dev_id = SST39VF3201, 1515 .dev_id = SST39VF3201,
1534 .name = "SST 39VF3201", 1516 .name = "SST 39VF3201",
1535 .devtypes = CFI_DEVICETYPE_X16, 1517 .devtypes = CFI_DEVICETYPE_X16,
@@ -1544,7 +1526,7 @@ static const struct amd_flash_info jedec_table[] = {
1544 ERASEINFO(0x1000,256) 1526 ERASEINFO(0x1000,256)
1545 } 1527 }
1546 }, { 1528 }, {
1547 .mfr_id = MANUFACTURER_SST, 1529 .mfr_id = CFI_MFR_SST,
1548 .dev_id = SST36VF3203, 1530 .dev_id = SST36VF3203,
1549 .name = "SST 36VF3203", 1531 .name = "SST 36VF3203",
1550 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1532 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1556,7 +1538,7 @@ static const struct amd_flash_info jedec_table[] = {
1556 ERASEINFO(0x10000,64), 1538 ERASEINFO(0x10000,64),
1557 } 1539 }
1558 }, { 1540 }, {
1559 .mfr_id = MANUFACTURER_ST, 1541 .mfr_id = CFI_MFR_ST,
1560 .dev_id = M29F800AB, 1542 .dev_id = M29F800AB,
1561 .name = "ST M29F800AB", 1543 .name = "ST M29F800AB",
1562 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1544 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1571,7 +1553,7 @@ static const struct amd_flash_info jedec_table[] = {
1571 ERASEINFO(0x10000,15), 1553 ERASEINFO(0x10000,15),
1572 } 1554 }
1573 }, { 1555 }, {
1574 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1556 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1575 .dev_id = M29W800DT, 1557 .dev_id = M29W800DT,
1576 .name = "ST M29W800DT", 1558 .name = "ST M29W800DT",
1577 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1559 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1586,7 +1568,7 @@ static const struct amd_flash_info jedec_table[] = {
1586 ERASEINFO(0x04000,1) 1568 ERASEINFO(0x04000,1)
1587 } 1569 }
1588 }, { 1570 }, {
1589 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1571 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1590 .dev_id = M29W800DB, 1572 .dev_id = M29W800DB,
1591 .name = "ST M29W800DB", 1573 .name = "ST M29W800DB",
1592 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1574 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1601,7 +1583,7 @@ static const struct amd_flash_info jedec_table[] = {
1601 ERASEINFO(0x10000,15) 1583 ERASEINFO(0x10000,15)
1602 } 1584 }
1603 }, { 1585 }, {
1604 .mfr_id = MANUFACTURER_ST, 1586 .mfr_id = CFI_MFR_ST,
1605 .dev_id = M29W400DT, 1587 .dev_id = M29W400DT,
1606 .name = "ST M29W400DT", 1588 .name = "ST M29W400DT",
1607 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1589 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1616,7 +1598,7 @@ static const struct amd_flash_info jedec_table[] = {
1616 ERASEINFO(0x10000,1) 1598 ERASEINFO(0x10000,1)
1617 } 1599 }
1618 }, { 1600 }, {
1619 .mfr_id = MANUFACTURER_ST, 1601 .mfr_id = CFI_MFR_ST,
1620 .dev_id = M29W400DB, 1602 .dev_id = M29W400DB,
1621 .name = "ST M29W400DB", 1603 .name = "ST M29W400DB",
1622 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1604 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1631,7 +1613,7 @@ static const struct amd_flash_info jedec_table[] = {
1631 ERASEINFO(0x10000,7) 1613 ERASEINFO(0x10000,7)
1632 } 1614 }
1633 }, { 1615 }, {
1634 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1616 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1635 .dev_id = M29W160DT, 1617 .dev_id = M29W160DT,
1636 .name = "ST M29W160DT", 1618 .name = "ST M29W160DT",
1637 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1619 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1646,7 +1628,7 @@ static const struct amd_flash_info jedec_table[] = {
1646 ERASEINFO(0x04000,1) 1628 ERASEINFO(0x04000,1)
1647 } 1629 }
1648 }, { 1630 }, {
1649 .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ 1631 .mfr_id = CFI_MFR_ST, /* FIXME - CFI device? */
1650 .dev_id = M29W160DB, 1632 .dev_id = M29W160DB,
1651 .name = "ST M29W160DB", 1633 .name = "ST M29W160DB",
1652 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1634 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1661,7 +1643,7 @@ static const struct amd_flash_info jedec_table[] = {
1661 ERASEINFO(0x10000,31) 1643 ERASEINFO(0x10000,31)
1662 } 1644 }
1663 }, { 1645 }, {
1664 .mfr_id = MANUFACTURER_ST, 1646 .mfr_id = CFI_MFR_ST,
1665 .dev_id = M29W040B, 1647 .dev_id = M29W040B,
1666 .name = "ST M29W040B", 1648 .name = "ST M29W040B",
1667 .devtypes = CFI_DEVICETYPE_X8, 1649 .devtypes = CFI_DEVICETYPE_X8,
@@ -1673,7 +1655,7 @@ static const struct amd_flash_info jedec_table[] = {
1673 ERASEINFO(0x10000,8), 1655 ERASEINFO(0x10000,8),
1674 } 1656 }
1675 }, { 1657 }, {
1676 .mfr_id = MANUFACTURER_ST, 1658 .mfr_id = CFI_MFR_ST,
1677 .dev_id = M50FW040, 1659 .dev_id = M50FW040,
1678 .name = "ST M50FW040", 1660 .name = "ST M50FW040",
1679 .devtypes = CFI_DEVICETYPE_X8, 1661 .devtypes = CFI_DEVICETYPE_X8,
@@ -1685,7 +1667,7 @@ static const struct amd_flash_info jedec_table[] = {
1685 ERASEINFO(0x10000,8), 1667 ERASEINFO(0x10000,8),
1686 } 1668 }
1687 }, { 1669 }, {
1688 .mfr_id = MANUFACTURER_ST, 1670 .mfr_id = CFI_MFR_ST,
1689 .dev_id = M50FW080, 1671 .dev_id = M50FW080,
1690 .name = "ST M50FW080", 1672 .name = "ST M50FW080",
1691 .devtypes = CFI_DEVICETYPE_X8, 1673 .devtypes = CFI_DEVICETYPE_X8,
@@ -1697,7 +1679,7 @@ static const struct amd_flash_info jedec_table[] = {
1697 ERASEINFO(0x10000,16), 1679 ERASEINFO(0x10000,16),
1698 } 1680 }
1699 }, { 1681 }, {
1700 .mfr_id = MANUFACTURER_ST, 1682 .mfr_id = CFI_MFR_ST,
1701 .dev_id = M50FW016, 1683 .dev_id = M50FW016,
1702 .name = "ST M50FW016", 1684 .name = "ST M50FW016",
1703 .devtypes = CFI_DEVICETYPE_X8, 1685 .devtypes = CFI_DEVICETYPE_X8,
@@ -1709,7 +1691,7 @@ static const struct amd_flash_info jedec_table[] = {
1709 ERASEINFO(0x10000,32), 1691 ERASEINFO(0x10000,32),
1710 } 1692 }
1711 }, { 1693 }, {
1712 .mfr_id = MANUFACTURER_ST, 1694 .mfr_id = CFI_MFR_ST,
1713 .dev_id = M50LPW080, 1695 .dev_id = M50LPW080,
1714 .name = "ST M50LPW080", 1696 .name = "ST M50LPW080",
1715 .devtypes = CFI_DEVICETYPE_X8, 1697 .devtypes = CFI_DEVICETYPE_X8,
@@ -1721,7 +1703,7 @@ static const struct amd_flash_info jedec_table[] = {
1721 ERASEINFO(0x10000,16), 1703 ERASEINFO(0x10000,16),
1722 }, 1704 },
1723 }, { 1705 }, {
1724 .mfr_id = MANUFACTURER_ST, 1706 .mfr_id = CFI_MFR_ST,
1725 .dev_id = M50FLW080A, 1707 .dev_id = M50FLW080A,
1726 .name = "ST M50FLW080A", 1708 .name = "ST M50FLW080A",
1727 .devtypes = CFI_DEVICETYPE_X8, 1709 .devtypes = CFI_DEVICETYPE_X8,
@@ -1736,7 +1718,7 @@ static const struct amd_flash_info jedec_table[] = {
1736 ERASEINFO(0x1000,16), 1718 ERASEINFO(0x1000,16),
1737 } 1719 }
1738 }, { 1720 }, {
1739 .mfr_id = MANUFACTURER_ST, 1721 .mfr_id = CFI_MFR_ST,
1740 .dev_id = M50FLW080B, 1722 .dev_id = M50FLW080B,
1741 .name = "ST M50FLW080B", 1723 .name = "ST M50FLW080B",
1742 .devtypes = CFI_DEVICETYPE_X8, 1724 .devtypes = CFI_DEVICETYPE_X8,
@@ -1751,7 +1733,7 @@ static const struct amd_flash_info jedec_table[] = {
1751 ERASEINFO(0x1000,16), 1733 ERASEINFO(0x1000,16),
1752 } 1734 }
1753 }, { 1735 }, {
1754 .mfr_id = 0xff00 | MANUFACTURER_ST, 1736 .mfr_id = 0xff00 | CFI_MFR_ST,
1755 .dev_id = 0xff00 | PSD4256G6V, 1737 .dev_id = 0xff00 | PSD4256G6V,
1756 .name = "ST PSD4256G6V", 1738 .name = "ST PSD4256G6V",
1757 .devtypes = CFI_DEVICETYPE_X16, 1739 .devtypes = CFI_DEVICETYPE_X16,
@@ -1763,7 +1745,7 @@ static const struct amd_flash_info jedec_table[] = {
1763 ERASEINFO(0x10000,16), 1745 ERASEINFO(0x10000,16),
1764 } 1746 }
1765 }, { 1747 }, {
1766 .mfr_id = MANUFACTURER_TOSHIBA, 1748 .mfr_id = CFI_MFR_TOSHIBA,
1767 .dev_id = TC58FVT160, 1749 .dev_id = TC58FVT160,
1768 .name = "Toshiba TC58FVT160", 1750 .name = "Toshiba TC58FVT160",
1769 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1751 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1778,7 +1760,7 @@ static const struct amd_flash_info jedec_table[] = {
1778 ERASEINFO(0x04000,1) 1760 ERASEINFO(0x04000,1)
1779 } 1761 }
1780 }, { 1762 }, {
1781 .mfr_id = MANUFACTURER_TOSHIBA, 1763 .mfr_id = CFI_MFR_TOSHIBA,
1782 .dev_id = TC58FVB160, 1764 .dev_id = TC58FVB160,
1783 .name = "Toshiba TC58FVB160", 1765 .name = "Toshiba TC58FVB160",
1784 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1766 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1793,7 +1775,7 @@ static const struct amd_flash_info jedec_table[] = {
1793 ERASEINFO(0x10000,31) 1775 ERASEINFO(0x10000,31)
1794 } 1776 }
1795 }, { 1777 }, {
1796 .mfr_id = MANUFACTURER_TOSHIBA, 1778 .mfr_id = CFI_MFR_TOSHIBA,
1797 .dev_id = TC58FVB321, 1779 .dev_id = TC58FVB321,
1798 .name = "Toshiba TC58FVB321", 1780 .name = "Toshiba TC58FVB321",
1799 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1781 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1806,7 +1788,7 @@ static const struct amd_flash_info jedec_table[] = {
1806 ERASEINFO(0x10000,63) 1788 ERASEINFO(0x10000,63)
1807 } 1789 }
1808 }, { 1790 }, {
1809 .mfr_id = MANUFACTURER_TOSHIBA, 1791 .mfr_id = CFI_MFR_TOSHIBA,
1810 .dev_id = TC58FVT321, 1792 .dev_id = TC58FVT321,
1811 .name = "Toshiba TC58FVT321", 1793 .name = "Toshiba TC58FVT321",
1812 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1794 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1819,7 +1801,7 @@ static const struct amd_flash_info jedec_table[] = {
1819 ERASEINFO(0x02000,8) 1801 ERASEINFO(0x02000,8)
1820 } 1802 }
1821 }, { 1803 }, {
1822 .mfr_id = MANUFACTURER_TOSHIBA, 1804 .mfr_id = CFI_MFR_TOSHIBA,
1823 .dev_id = TC58FVB641, 1805 .dev_id = TC58FVB641,
1824 .name = "Toshiba TC58FVB641", 1806 .name = "Toshiba TC58FVB641",
1825 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1807 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1832,7 +1814,7 @@ static const struct amd_flash_info jedec_table[] = {
1832 ERASEINFO(0x10000,127) 1814 ERASEINFO(0x10000,127)
1833 } 1815 }
1834 }, { 1816 }, {
1835 .mfr_id = MANUFACTURER_TOSHIBA, 1817 .mfr_id = CFI_MFR_TOSHIBA,
1836 .dev_id = TC58FVT641, 1818 .dev_id = TC58FVT641,
1837 .name = "Toshiba TC58FVT641", 1819 .name = "Toshiba TC58FVT641",
1838 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8, 1820 .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
@@ -1845,7 +1827,7 @@ static const struct amd_flash_info jedec_table[] = {
1845 ERASEINFO(0x02000,8) 1827 ERASEINFO(0x02000,8)
1846 } 1828 }
1847 }, { 1829 }, {
1848 .mfr_id = MANUFACTURER_WINBOND, 1830 .mfr_id = CFI_MFR_WINBOND,
1849 .dev_id = W49V002A, 1831 .dev_id = W49V002A,
1850 .name = "Winbond W49V002A", 1832 .name = "Winbond W49V002A",
1851 .devtypes = CFI_DEVICETYPE_X8, 1833 .devtypes = CFI_DEVICETYPE_X8,
@@ -1878,7 +1860,7 @@ static inline u32 jedec_read_mfr(struct map_info *map, uint32_t base,
1878 mask = (1 << (cfi->device_type * 8)) - 1; 1860 mask = (1 << (cfi->device_type * 8)) - 1;
1879 result = map_read(map, base + ofs); 1861 result = map_read(map, base + ofs);
1880 bank++; 1862 bank++;
1881 } while ((result.x[0] & mask) == CONTINUATION_CODE); 1863 } while ((result.x[0] & mask) == CFI_MFR_CONTINUATION);
1882 1864
1883 return result.x[0] & mask; 1865 return result.x[0] & mask;
1884} 1866}
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
index 5716fc78ca8e..574d9ee066f1 100644
--- a/include/linux/mtd/cfi.h
+++ b/include/linux/mtd/cfi.h
@@ -516,16 +516,25 @@ struct cfi_fixup {
516 void* param; 516 void* param;
517}; 517};
518 518
519#define CFI_MFR_ANY 0xffff 519#define CFI_MFR_ANY 0xFFFF
520#define CFI_ID_ANY 0xffff 520#define CFI_ID_ANY 0xFFFF
521#define CFI_MFR_CONTINUATION 0x007F
521 522
522#define CFI_MFR_AMD 0x0001 523#define CFI_MFR_AMD 0x0001
523#define CFI_MFR_ATMEL 0x001F 524#define CFI_MFR_ATMEL 0x001F
525#define CFI_MFR_EON 0x001C
526#define CFI_MFR_FUJITSU 0x0004
527#define CFI_MFR_HYUNDAI 0x00AD
524#define CFI_MFR_INTEL 0x0089 528#define CFI_MFR_INTEL 0x0089
525#define CFI_MFR_MACRONIX 0x00C2 529#define CFI_MFR_MACRONIX 0x00C2
530#define CFI_MFR_NEC 0x0010
531#define CFI_MFR_PMC 0x009D
526#define CFI_MFR_SAMSUNG 0x00EC 532#define CFI_MFR_SAMSUNG 0x00EC
533#define CFI_MFR_SHARP 0x00B0
527#define CFI_MFR_SST 0x00BF 534#define CFI_MFR_SST 0x00BF
528#define CFI_MFR_ST 0x0020 /* STMicroelectronics */ 535#define CFI_MFR_ST 0x0020 /* STMicroelectronics */
536#define CFI_MFR_TOSHIBA 0x0098
537#define CFI_MFR_WINBOND 0x00DA
529 538
530void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups); 539void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);
531 540
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-10 08:52:02 -0500