aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.35/108-mtd_fix_cfi_cmdset_0002_status_check.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-10-21 18:41:52 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-10-21 18:41:52 +0000
commitd40b0f352929653666b76961e8b521366837fdca (patch)
tree1c25a4a078430f47b72527798cf6c650c93a3d34 /target/linux/ar71xx/patches-2.6.35/108-mtd_fix_cfi_cmdset_0002_status_check.patch
parentad8315223159c7b3eeffa2e5047fb871d29d481e (diff)
downloadupstream-d40b0f352929653666b76961e8b521366837fdca.tar.gz
upstream-d40b0f352929653666b76961e8b521366837fdca.tar.bz2
upstream-d40b0f352929653666b76961e8b521366837fdca.zip
ar71xx: remove unused kernel versions, 2.6.36 should be the next target
SVN-Revision: 23571
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.35/108-mtd_fix_cfi_cmdset_0002_status_check.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.35/108-mtd_fix_cfi_cmdset_0002_status_check.patch69
1 files changed, 0 insertions, 69 deletions
diff --git a/target/linux/ar71xx/patches-2.6.35/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.35/108-mtd_fix_cfi_cmdset_0002_status_check.patch
deleted file mode 100644
index 0afdb8b319..0000000000
--- a/target/linux/ar71xx/patches-2.6.35/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
-@@ -1217,8 +1217,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);
-@@ -1234,6 +1234,8 @@ static int __xipram do_write_oneword(str
-
- ret = -EIO;
- }
-+
-+ enable_xip:
- xip_enable(map, chip, adr);
- op_done:
- chip->state = FL_READY;
-@@ -1580,7 +1582,6 @@ static int cfi_amdstd_write_buffers(stru
- return 0;
- }
-
--
- /*
- * Handle devices with one erase region, that only implement
- * the chip erase command.
-@@ -1644,8 +1645,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",
-@@ -1665,6 +1666,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);
-@@ -1732,9 +1734,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)) {
-@@ -1756,6 +1758,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);