ar71xx: nuke 2.6.39 support

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-2.6.39 / 108-mtd_fix_cfi_cmdset_0002_status_check.patch

diff --git a/target/linux/ar71xx/patches-2.6.39/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.39/108-mtd_fix_cfi_cmdset_0002_status_check.patch
deleted file mode 100644 (file)
index 226f3b0..0000000
--- a/target/linux/ar71xx/patches-2.6.39/108-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1219,8 +1219,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);
-@@ -1236,6 +1236,8 @@ static int __xipram do_write_oneword(str
- 
-               ret = -EIO;
-       }
-+
-+ enable_xip:
-       xip_enable(map, chip, adr);
-  op_done:
-       chip->state = FL_READY;
-@@ -1567,7 +1569,6 @@ static int cfi_amdstd_write_buffers(stru
-       return 0;
- }
- 
--
- /*
-  * Handle devices with one erase region, that only implement
-  * the chip erase command.
-@@ -1631,8 +1632,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",
-@@ -1652,6 +1653,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);
-@@ -1719,9 +1721,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)) {
-@@ -1743,6 +1745,7 @@ static int __xipram do_erase_oneblock(st
-               ret = -EIO;
-       }
- 
-+ op_done:
-       chip->state = FL_READY;
-       put_chip(map, chip, adr);
-       mutex_unlock(&chip->mutex);