diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:42:58 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-06-26 20:42:58 +0000 |
| commit | da1bb88a2b900f0392b731ec47c5e1bff956fd8f (patch) | |
| tree | 597146471e3eeafb4ba55e802e80b896770808ff /target/linux/generic/patches-2.6.25/007-samsung_flash.patch | |
| parent | 6117c04c9416b295347fb45c37e430f01df1d0d9 (diff) | |
| download | upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.tar.gz upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.tar.bz2 upstream-da1bb88a2b900f0392b731ec47c5e1bff956fd8f.zip | |
rename target/linux/generic-2.6 to generic
SVN-Revision: 21952
Diffstat (limited to 'target/linux/generic/patches-2.6.25/007-samsung_flash.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.25/007-samsung_flash.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.25/007-samsung_flash.patch b/target/linux/generic/patches-2.6.25/007-samsung_flash.patch new file mode 100644 index 0000000000..557736f7a4 --- /dev/null +++ b/target/linux/generic/patches-2.6.25/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 *); +@@ -298,12 +299,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 */ |