diff options
Diffstat (limited to 'drivers/mtd/chips/cfi_cmdset_0001.c')
-rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index c240454fd113..e772803b4959 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #define MANUFACTURER_INTEL 0x0089 | 46 | #define MANUFACTURER_INTEL 0x0089 |
47 | #define I82802AB 0x00ad | 47 | #define I82802AB 0x00ad |
48 | #define I82802AC 0x00ac | 48 | #define I82802AC 0x00ac |
49 | #define PF38F4476 0x881c | ||
49 | #define MANUFACTURER_ST 0x0020 | 50 | #define MANUFACTURER_ST 0x0020 |
50 | #define M50LPW080 0x002F | 51 | #define M50LPW080 0x002F |
51 | #define M50FLW080A 0x0080 | 52 | #define M50FLW080A 0x0080 |
@@ -315,9 +316,18 @@ static struct cfi_fixup fixup_table[] = { | |||
315 | { 0, 0, NULL, NULL } | 316 | { 0, 0, NULL, NULL } |
316 | }; | 317 | }; |
317 | 318 | ||
319 | static void cfi_fixup_major_minor(struct cfi_private *cfi, | ||
320 | struct cfi_pri_intelext *extp) | ||
321 | { | ||
322 | if (cfi->mfr == MANUFACTURER_INTEL && | ||
323 | cfi->id == PF38F4476 && extp->MinorVersion == '3') | ||
324 | extp->MinorVersion = '1'; | ||
325 | } | ||
326 | |||
318 | static inline struct cfi_pri_intelext * | 327 | static inline struct cfi_pri_intelext * |
319 | read_pri_intelext(struct map_info *map, __u16 adr) | 328 | read_pri_intelext(struct map_info *map, __u16 adr) |
320 | { | 329 | { |
330 | struct cfi_private *cfi = map->fldrv_priv; | ||
321 | struct cfi_pri_intelext *extp; | 331 | struct cfi_pri_intelext *extp; |
322 | unsigned int extp_size = sizeof(*extp); | 332 | unsigned int extp_size = sizeof(*extp); |
323 | 333 | ||
@@ -326,6 +336,8 @@ read_pri_intelext(struct map_info *map, __u16 adr) | |||
326 | if (!extp) | 336 | if (!extp) |
327 | return NULL; | 337 | return NULL; |
328 | 338 | ||
339 | cfi_fixup_major_minor(cfi, extp); | ||
340 | |||
329 | if (extp->MajorVersion != '1' || | 341 | if (extp->MajorVersion != '1' || |
330 | (extp->MinorVersion < '0' || extp->MinorVersion > '5')) { | 342 | (extp->MinorVersion < '0' || extp->MinorVersion > '5')) { |
331 | printk(KERN_ERR " Unknown Intel/Sharp Extended Query " | 343 | printk(KERN_ERR " Unknown Intel/Sharp Extended Query " |