diff options
author | Guillaume LECERF <glecerf@gmail.com> | 2009-12-15 17:01:06 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-02-26 11:45:52 -0500 |
commit | f3e69c6584be2db1ccd5292d6a1d7c566d265701 (patch) | |
tree | c2fc110ef5345fd22aa1b82204322027a7dd9531 /include/linux/mtd/cfi.h | |
parent | 66803762c19f2e45ff4cc13cf63194589eb698c2 (diff) |
mtd: move more manufacturers to the common cfi.h header file
Move MANUFACTURER_MACRONIX and MANUFACTURER_SST definitions to the
include/linux/mtd/cfi.h header file and rename them to CFI_MFR_MACRONIX and
CFI_MFR_SST.
All references in drivers/mtd/chips/cfi_cmdset_0002.c are updated to reflect
this.
Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/linux/mtd/cfi.h')
-rw-r--r-- | include/linux/mtd/cfi.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index a4eefc5810dc..cee05b1e62b1 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h | |||
@@ -518,11 +518,13 @@ struct cfi_fixup { | |||
518 | #define CFI_MFR_ANY 0xffff | 518 | #define CFI_MFR_ANY 0xffff |
519 | #define CFI_ID_ANY 0xffff | 519 | #define CFI_ID_ANY 0xffff |
520 | 520 | ||
521 | #define CFI_MFR_AMD 0x0001 | 521 | #define CFI_MFR_AMD 0x0001 |
522 | #define CFI_MFR_INTEL 0x0089 | 522 | #define CFI_MFR_ATMEL 0x001F |
523 | #define CFI_MFR_ATMEL 0x001F | 523 | #define CFI_MFR_INTEL 0x0089 |
524 | #define CFI_MFR_SAMSUNG 0x00EC | 524 | #define CFI_MFR_MACRONIX 0x00C2 |
525 | #define CFI_MFR_ST 0x0020 /* STMicroelectronics */ | 525 | #define CFI_MFR_SAMSUNG 0x00EC |
526 | #define CFI_MFR_SST 0x00BF | ||
527 | #define CFI_MFR_ST 0x0020 /* STMicroelectronics */ | ||
526 | 528 | ||
527 | void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups); | 529 | void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups); |
528 | 530 | ||