diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-06-13 09:53:55 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-06-13 09:53:55 +0000 |
| commit | 368745c06aea192306cc53407334099e09a91ae0 (patch) | |
| tree | 7f02308822a7d103dabf351b5e4b4ee983ee882e /target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch | |
| parent | dc5248c47b22e907208c32f0769eab8a2408c509 (diff) | |
| download | upstream-368745c06aea192306cc53407334099e09a91ae0.tar.gz upstream-368745c06aea192306cc53407334099e09a91ae0.tar.bz2 upstream-368745c06aea192306cc53407334099e09a91ae0.zip | |
fix samsung flash patch after r21408, thanks to Matthias Buecher (#7348)
SVN-Revision: 21775
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch index eab03db50d..46923358b3 100644 --- a/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch +++ b/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch @@ -1,11 +1,37 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -327,9 +327,32 @@ static void cfi_fixup_major_minor(struct + { + // manufacturers defined in include/linux/mtd/cfi.h - cfi_fixup_major_minor(cfi, extp); +- if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && +- extp->MajorVersion == '0') ++ if (cfi->mfr == CFI_MFR_SAMSUNG && ++ extp->MajorVersion == '0') { ++ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", ++ extp->MajorVersion, extp->MinorVersion); ++ + extp->MajorVersion = '1'; ++ extp->MinorVersion = '0'; ++ ++ printk(" to %c.%c.\n", ++ extp->MajorVersion, extp->MinorVersion); ++ } ++ ++ if (cfi->mfr == CFI_MFR_SAMSUNG && ++ extp->MajorVersion == '3' && extp->MinorVersion == '3') { ++ printk(KERN_NOTICE " Newer Samsung flash detected, " ++ "should be compatibile with Amd/Fujitsu.\n"); ++ ++ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", ++ extp->MajorVersion, extp->MinorVersion); ++ ++ extp->MajorVersion = '1'; // set to 1.3 (last defined version) ++ extp->MinorVersion = '3'; ++ ++ printk(" to %c.%c.\n", ++ extp->MajorVersion, extp->MinorVersion); ++ } + } -- if (extp->MajorVersion != '1' || -+ if (extp->MajorVersion < '0' || extp->MajorVersion > '3' || - (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { - if (cfi->mfr == MANUFACTURER_SAMSUNG && - (extp->MajorVersion == '3' && extp->MinorVersion == '3')) { + struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) |