[openap-cvs] : linux/drivers/mtd/chips cfi_cmdset_0002.c,1.1.1.1,1.2 jedec_probe.c,1.1.1.1,1.2

[David C Wang <address@hidden>]

Update of /cvsroot/openap/linux/drivers/mtd/chips
In directory subversions:/tmp/cvs-serv5742/drivers/mtd/chips

Modified Files:
        cfi_cmdset_0002.c jedec_probe.c 
Log Message:
updated linux kernel pristine sources to openap release 1.1



Index: cfi_cmdset_0002.c
===================================================================
RCS file: /cvsroot/openap/linux/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- cfi_cmdset_0002.c   14 May 2002 18:31:04 -0000      1.1.1.1
+++ cfi_cmdset_0002.c   14 May 2002 19:53:30 -0000      1.2
@@ -331,6 +331,7 @@
        struct cfi_private *cfi = map->fldrv_priv;
        DECLARE_WAITQUEUE(wait, current);
        int ret = 0;
+       int tries_left = 5;
 
  retry:
        cfi_spin_lock(chip->mutex);
@@ -395,6 +396,15 @@
                printk(KERN_WARNING "Last[%ld] is %x, datum is %x\n",(Count - 
1) % 4,Last[(Count - 1) % 4],datum);
                cfi_send_gen_cmd(0xF0, 0, chip->start, map, cfi, 
cfi->device_type, NULL);
                DISABLE_VPP(map);
+               if (tries_left > 0) { // dave
+                       printk(KERN_WARNING "mtd lowlevel write error: %d 
retries left: retrying\n", tries_left);
+                       ret = 0;
+                       tries_left--;
+                       chip->state = FL_READY;
+                       cfi_spin_unlock(chip->mutex);
+                       cfi_udelay(10);
+                       goto retry;
+               }
                ret = -EIO;
        }       
        DISABLE_VPP(map);
@@ -589,7 +599,7 @@
        timeo = jiffies + (HZ*20);
 
        cfi_spin_unlock(chip->mutex);
-       schedule_timeout(HZ);
+       schedule_timeout(HZ/5);
        cfi_spin_lock(chip->mutex);
        
        rdy_mask = CMD(0x80);

Index: jedec_probe.c
===================================================================
RCS file: /cvsroot/openap/linux/drivers/mtd/chips/jedec_probe.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- jedec_probe.c       14 May 2002 18:31:01 -0000      1.1.1.1
+++ jedec_probe.c       14 May 2002 19:53:30 -0000      1.2
@@ -26,6 +26,7 @@
 #define MANUFACTURER_ST                0x0020
 #define MANUFACTURER_SST       0x00BF
 #define MANUFACTURER_TOSHIBA   0x0098
+#define MANUFACTURER_MACRONIX   0x00C2
 
 /* AMD */
 #define AM29F800BB     0x2258
@@ -56,6 +57,10 @@
 #define TC58FVT160     0x00C2
 #define TC58FVB160     0x0043
 
+/* Macronix */
+#define MX29F800Bx8     0x0058  // MX29F800B used as 8 bit device
+#define MX29F800Tx8     0x00D6  // MX29F800B used as 8 bit device
+
 
 struct amd_flash_info {
        const __u16 mfr_id;
@@ -248,6 +253,30 @@
                           ERASEINFO(0x08000,2),
                          ERASEINFO(0x02000,8)
                 }
+         }, {
+               mfr_id: MANUFACTURER_MACRONIX,
+               dev_id: MX29F800Bx8,
+               name: "Macronix MX29F800B - 8bit access",
+               DevSize: SIZE_1MiB,
+//             CmdSet: P_ID_AMD_STD,
+               NumEraseRegions: 4,
+               regions: {ERASEINFO(0x04000,1),
+                         ERASEINFO(0x02000,2),
+                         ERASEINFO(0x08000,1),
+                         ERASEINFO(0x10000,15),
+               }
+       }, {
+               mfr_id: MANUFACTURER_MACRONIX,
+               dev_id: MX29F800Tx8,
+               name: "Macronix MX29F800T - 8bit access",
+               DevSize: SIZE_1MiB,
+//             CmdSet: P_ID_AMD_STD,
+               NumEraseRegions: 4,
+               regions: {ERASEINFO(0x10000,15),
+                         ERASEINFO(0x08000,1),
+                         ERASEINFO(0x02000,2),
+                         ERASEINFO(0x04000,1)
+               }
        } 
 };