From be088cec8b463417dc287d584b18d59d475798f9 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 13 Jun 2010 09:53:55 +0000
Subject: [kernel] fix samsung flash patch after r21408, thanks to Matthias
 Buecher (#7348)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21775 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../patches-2.6.35/089-mtd-samsung-flash.patch     | 42 +++++++++++++++++-----
 1 file changed, 34 insertions(+), 8 deletions(-)

(limited to 'target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch')

diff --git a/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch
index 4160b813a2..7cb4efdffc 100644
--- a/target/linux/generic-2.6/patches-2.6.35/089-mtd-samsung-flash.patch
+++ b/target/linux/generic-2.6/patches-2.6.35/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
-@@ -418,7 +418,7 @@
- 			 */
- 			cfi_fixup_major_minor(cfi, extp);
+@@ -374,9 +374,32 @@ static void cfi_fixup_major_minor(struct
+ {
+ 	// manufacturers defined in include/linux/mtd/cfi.h
  
--			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')) {
+-	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);
++	}
+ }
+ 
+ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
-- 
cgit v1.2.3