| 1 | --- a/drivers/mtd/chips/cfi_cmdset_0002.c |
| 2 | +++ b/drivers/mtd/chips/cfi_cmdset_0002.c |
| 3 | @@ -392,9 +392,35 @@ static struct cfi_fixup fixup_table[] = |
| 4 | static void cfi_fixup_major_minor(struct cfi_private *cfi, |
| 5 | struct cfi_pri_amdstd *extp) |
| 6 | { |
| 7 | - if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && |
| 8 | - extp->MajorVersion == '0') |
| 9 | - extp->MajorVersion = '1'; |
| 10 | + /* Manufacturers are defined in include/linux/mtd/cfi.h */ |
| 11 | + |
| 12 | + if (cfi->mfr == CFI_MFR_SAMSUNG && |
| 13 | + extp->MajorVersion == '0') { |
| 14 | + printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", |
| 15 | + extp->MajorVersion, extp->MinorVersion); |
| 16 | + |
| 17 | + extp->MajorVersion = '1'; |
| 18 | + extp->MinorVersion = '0'; |
| 19 | + |
| 20 | + printk(" to %c.%c.\n", |
| 21 | + extp->MajorVersion, extp->MinorVersion); |
| 22 | + } |
| 23 | + |
| 24 | + if (cfi->mfr == CFI_MFR_SAMSUNG && |
| 25 | + extp->MajorVersion == '3' && extp->MinorVersion == '3') { |
| 26 | + printk(KERN_NOTICE " Newer Samsung flash detected, " |
| 27 | + "should be compatible with Amd/Fujitsu.\n"); |
| 28 | + |
| 29 | + printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", |
| 30 | + extp->MajorVersion, extp->MinorVersion); |
| 31 | + |
| 32 | + extp->MajorVersion = '1'; // set to 1.3 |
| 33 | + extp->MinorVersion = '3'; |
| 34 | + |
| 35 | + printk(" to %c.%c.\n", |
| 36 | + extp->MajorVersion, extp->MinorVersion); |
| 37 | + } |
| 38 | + |
| 39 | /* |
| 40 | * SST 38VF640x chips report major=0xFF / minor=0xFF. |
| 41 | */ |
| 42 | |
