mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-20 01:44:10 +03:00
70 lines
1.6 KiB
Diff
70 lines
1.6 KiB
Diff
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
@@ -1141,8 +1141,8 @@ static int __xipram do_write_oneword(str
|
||
|
break;
|
||
|
}
|
||
|
|
||
|
- if (chip_ready(map, adr))
|
||
|
- break;
|
||
|
+ if (chip_good(map, adr, datum))
|
||
|
+ goto enable_xip;
|
||
|
|
||
|
/* Latency issues. Drop the lock, wait a while and retry */
|
||
|
UDELAY(map, chip, adr, 1);
|
||
|
@@ -1158,6 +1158,8 @@ static int __xipram do_write_oneword(str
|
||
|
|
||
|
ret = -EIO;
|
||
|
}
|
||
|
+
|
||
|
+ enable_xip:
|
||
|
xip_enable(map, chip, adr);
|
||
|
op_done:
|
||
|
chip->state = FL_READY;
|
||
|
@@ -1504,7 +1506,6 @@ static int cfi_amdstd_write_buffers(stru
|
||
|
return 0;
|
||
|
}
|
||
|
|
||
|
-
|
||
|
/*
|
||
|
* Handle devices with one erase region, that only implement
|
||
|
* the chip erase command.
|
||
|
@@ -1568,8 +1569,8 @@ static int __xipram do_erase_chip(struct
|
||
|
chip->erase_suspended = 0;
|
||
|
}
|
||
|
|
||
|
- if (chip_ready(map, adr))
|
||
|
- break;
|
||
|
+ if (chip_good(map, adr, map_word_ff(map)))
|
||
|
+ goto op_done;
|
||
|
|
||
|
if (time_after(jiffies, timeo)) {
|
||
|
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
||
|
@@ -1589,6 +1590,7 @@ static int __xipram do_erase_chip(struct
|
||
|
ret = -EIO;
|
||
|
}
|
||
|
|
||
|
+ op_done:
|
||
|
chip->state = FL_READY;
|
||
|
xip_enable(map, chip, adr);
|
||
|
put_chip(map, chip, adr);
|
||
|
@@ -1656,9 +1658,9 @@ static int __xipram do_erase_oneblock(st
|
||
|
chip->erase_suspended = 0;
|
||
|
}
|
||
|
|
||
|
- if (chip_ready(map, adr)) {
|
||
|
+ if (chip_good(map, adr, map_word_ff(map))) {
|
||
|
xip_enable(map, chip, adr);
|
||
|
- break;
|
||
|
+ goto op_done;
|
||
|
}
|
||
|
|
||
|
if (time_after(jiffies, timeo)) {
|
||
|
@@ -1680,6 +1682,7 @@ static int __xipram do_erase_oneblock(st
|
||
|
ret = -EIO;
|
||
|
}
|
||
|
|
||
|
+ op_done:
|
||
|
chip->state = FL_READY;
|
||
|
put_chip(map, chip, adr);
|
||
|
spin_unlock(chip->mutex);
|