[LinuxBIOS] r2962 - trunk/util/flashrom

Author: hailfinger
Date: 2007-11-13 15:56:54 +0100 (Tue, 13 Nov 2007)
New Revision: 2962

Modified:
   trunk/util/flashrom/jedec.c
Log:
Fix ATMEL 29C020 detection with flashrom. The JEDEC probe routine had
a delay of 10 us after entering ID mode and this was insufficient for
the 29C020. The data sheet claims we have to wait 10 ms, but tests have
shown that 20 us suffice. Allow for variations in chip delays with a
factor of 2 safety margin.

Signed-off-by: Carl-Daniel Hailfinger 
Acked-by: Peter Stuge

Modified: trunk/util/flashrom/jedec.c
===================================================================
--- trunk/util/flashrom/jedec.c	2007-11-13 14:40:45 UTC (rev 2961)
+++ trunk/util/flashrom/jedec.c	2007-11-13 14:56:54 UTC (rev 2962)
@@ -89,7 +89,11 @@
    *(volatile uint8_t *)(bios + 0x2AAA) = 0x55;
    myusec_delay(10);
    *(volatile uint8_t *)(bios + 0x5555) = 0x90;
-	myusec_delay(10);
+	/* Older chips may need up to 100 us to respond. The ATMEL 29C020
+	 * needs 10 ms according to the data sheet, but it has been tested
+	 * to work reliably with 20 us. Allow a factor of 2 safety margin.
+	 */
+	myusec_delay(40);

/* Read product ID */
    id1 = *(volatile uint8_t *)bios;
@@ -101,7 +105,7 @@
    *(volatile uint8_t *)(bios + 0x2AAA) = 0x55;
    myusec_delay(10);
    *(volatile uint8_t *)(bios + 0x5555) = 0xF0;
-	myusec_delay(10);
+	myusec_delay(40);

printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2);
    if (id1 == flash->manufacture_id && id2 == flash->model_id)