diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2009-05-28 10:00:48 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2009-05-28 10:00:48 +0000 |
| commit | 7adb67f18469e51cecb83a0c2efbf22494acb244 (patch) | |
| tree | fe225b163b00d82bf2dfa88ec105309675690049 /target/linux/generic-2.6/patches-2.6.29/007-samsung_flash.patch | |
| parent | 52d975c359b8330e2844d3bb942588bd5afd73e6 (diff) | |
| download | master-31e0f0ae-7adb67f18469e51cecb83a0c2efbf22494acb244.tar.gz master-31e0f0ae-7adb67f18469e51cecb83a0c2efbf22494acb244.tar.bz2 master-31e0f0ae-7adb67f18469e51cecb83a0c2efbf22494acb244.zip | |
revert 15922 - add back 2.6.29 kernel support
SVN-Revision: 16127
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/007-samsung_flash.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.29/007-samsung_flash.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.29/007-samsung_flash.patch new file mode 100644 index 0000000000..1faeb41eaa --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.29/007-samsung_flash.patch @@ -0,0 +1,36 @@ +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c +@@ -51,6 +51,7 @@ + #define SST49LF040B 0x0050 + #define SST49LF008A 0x005a + #define AT49BV6416 0x00d6 ++#define MANUFACTURER_SAMSUNG 0x00ec + + static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); + static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); +@@ -375,12 +376,19 @@ struct mtd_info *cfi_cmdset_0002(struct + + if (extp->MajorVersion != '1' || + (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { +- printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " +- "version %c.%c.\n", extp->MajorVersion, +- extp->MinorVersion); +- kfree(extp); +- kfree(mtd); +- return NULL; ++ if (cfi->mfr == MANUFACTURER_SAMSUNG && ++ (extp->MajorVersion == '3' && extp->MinorVersion == '3')) { ++ printk(KERN_NOTICE " Newer Samsung flash detected, " ++ "should be compatibile with Amd/Fujitsu.\n"); ++ } ++ else { ++ printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " ++ "version %c.%c.\n", extp->MajorVersion, ++ extp->MinorVersion); ++ kfree(extp); ++ kfree(mtd); ++ return NULL; ++ } + } + + /* Install our own private info structure */ |