aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-16 01:56:04 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-16 01:56:04 +0000
commitf019ac4dc9b89958657dd8c9d81bb2e270c938e7 (patch)
tree59ba27f549ecae008485f94b3771c4fe1df4a563 /target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch
parent4f16e9cc3e2c187d19b24785a55ce30a892efd68 (diff)
downloadupstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.tar.gz
upstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.tar.bz2
upstream-f019ac4dc9b89958657dd8c9d81bb2e270c938e7.zip
prepare for the transition to linux 2.6.22 - make it possible to override the kernel version in the target makefile
SVN-Revision: 7644
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch
new file mode 100644
index 0000000000..8c94003081
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.22/007-samsung_flash.patch
@@ -0,0 +1,37 @@
+diff -urN linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.6.21.1.old/drivers/mtd/chips/cfi_cmdset_0002.c 2007-04-27 23:49:26.000000000 +0200
++++ linux-2.6.21.1.dev/drivers/mtd/chips/cfi_cmdset_0002.c 2007-05-26 19:30:01.049193968 +0200
+@@ -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 *);
+@@ -294,12 +295,19 @@
+
+ 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 */