aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mtd/cfi.h
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 /include/linux/mtd/cfi.h
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 (limited to 'include/linux/mtd/cfi.h')
-rw-r--r--include/linux/mtd/cfi.h13
1 files changed, 11 insertions, 2 deletions
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