linux/generic: add some missing patches, refresh patches
[15.05/openwrt.git] / target / linux / generic / patches-2.6.37 / 089-mtd-samsung-flash.patch
1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
3 @@ -394,15 +394,31 @@ static void cfi_fixup_major_minor(struct
4  {
5         // manufacturers defined in include/linux/mtd/cfi.h
6  
7 -       if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
8 -           extp->MajorVersion == '0')
9 -               extp->MajorVersion = '1';
10 -       /*
11 -        * SST 38VF640x chips report major=0xFF / minor=0xFF.
12 -        */
13 -       if (cfi->mfr == CFI_MFR_SST && (cfi->id >> 4) == 0x0536) {
14 -               extp->MajorVersion = '1';
15 -               extp->MinorVersion = '0';
16 +       if (cfi->mfr == CFI_MFR_SAMSUNG &&
17 +               extp->MajorVersion == '0') {
18 +                       printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
19 +                               extp->MajorVersion, extp->MinorVersion);
20 +
21 +                       extp->MajorVersion = '1';
22 +                       extp->MinorVersion = '0';
23 +
24 +                       printk(" to %c.%c.\n",
25 +                               extp->MajorVersion, extp->MinorVersion);
26 +       }
27 +
28 +       if (cfi->mfr == CFI_MFR_SAMSUNG &&
29 +               extp->MajorVersion == '3' && extp->MinorVersion == '3') {
30 +                       printk(KERN_NOTICE "  Newer Samsung flash detected, "
31 +                               "should be compatibile with Amd/Fujitsu.\n");
32 +
33 +                       printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
34 +                               extp->MajorVersion, extp->MinorVersion);
35 +
36 +                       extp->MajorVersion = '1';       // set to 1.3 (last defined version)
37 +                       extp->MinorVersion = '3';
38 +
39 +                       printk(" to %c.%c.\n",
40 +                               extp->MajorVersion, extp->MinorVersion);
41         }
42  }
43