Changeset 13312

Timestamp:

11/25/09 18:58:48 (3 years ago)

Author:

eko

Message:

Samsung flash patch

Location:

src/linux/brcm/linux-2.6.23/drivers/mtd

Files:

• chips/cfi_cmdset_0002.c (modified) (2 diffs)
• maps/bcm947xx-flash.c (modified) (1 diff)

src/linux/brcm/linux-2.6.23/drivers/mtd/chips/cfi_cmdset_0002.c

@@ -52 +52 @@
 #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 *);
@@ -293 +294 @@
                 }
 
-                if (extp->MajorVersion != '1' ||
+                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;
+                        } 
                 }
 

src/linux/brcm/linux-2.6.23/drivers/mtd/maps/bcm947xx-flash.c

@@ -531 +531 @@
 
         /* override copy_from routine */
-        bcm947xx_map.copy_from = bcm47xx_map_copy_from;
+//      bcm947xx_map.copy_from = bcm47xx_map_copy_from;
 
         /* Allow size override for testing */