aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch
blob: 876e2dc10fd04c40b4b995db56d4b0ebe529a6ca (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -371,9 +371,34 @@ static struct cfi_fixup fixup_table[] = 
 static void cfi_fixup_major_minor(struct cfi_private *cfi,
 				  struct cfi_pri_amdstd *extp)
 {
-	if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
-	    extp->MajorVersion == '0')
-		extp->MajorVersion = '1';
+	/* Manufacturers are defined in include/linux/mtd/cfi.h */
+
+	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 compatible 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
+			extp->MinorVersion = '3';
+
+			printk(" to %c.%c.\n",
+				extp->MajorVersion, extp->MinorVersion);
+	}
 }
 
 struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)