diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2008-01-28 13:36:09 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2008-01-28 13:36:09 +0000 |
commit | 87cb2bc52984aff7f9ad26a18c006cb3182a8904 (patch) | |
tree | f00be1d7b9ccfbea3a6c09dd6ef6f32d1c92df27 /target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch | |
parent | 18ce9e8974f2a39c5c3b42c5e2eda97533e1ecdc (diff) | |
download | master-187ad058-87cb2bc52984aff7f9ad26a18c006cb3182a8904.tar.gz master-187ad058-87cb2bc52984aff7f9ad26a18c006cb3182a8904.tar.bz2 master-187ad058-87cb2bc52984aff7f9ad26a18c006cb3182a8904.zip |
generic 2.6.24 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10291 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch new file mode 100644 index 0000000000..1be698ce0f --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.24/007-samsung_flash.patch @@ -0,0 +1,38 @@ +Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c +=================================================================== +--- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2007-09-21 16:23:54.000000000 +0800 ++++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0002.c 2007-09-21 16:23:57.000000000 +0800 +@@ -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 */ |