diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-29 16:02:31 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-12-29 16:02:31 +0000 |
| commit | 87271e9f28796debd156da0b2466bc286ccbac0f (patch) | |
| tree | f155ac33958d33a2f945aa9835c1e68a0d1619f4 /target/linux/ar71xx/patches-3.7/403-mtd_fix_cfi_cmdset_0002_status_check.patch | |
| parent | a3a6e0f0396714106c8942c89a55179213d85726 (diff) | |
| download | master-31e0f0ae-87271e9f28796debd156da0b2466bc286ccbac0f.tar.gz master-31e0f0ae-87271e9f28796debd156da0b2466bc286ccbac0f.tar.bz2 master-31e0f0ae-87271e9f28796debd156da0b2466bc286ccbac0f.zip | |
ar71xx: add support for 3.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34920
Diffstat (limited to 'target/linux/ar71xx/patches-3.7/403-mtd_fix_cfi_cmdset_0002_status_check.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-3.7/403-mtd_fix_cfi_cmdset_0002_status_check.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-3.7/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-3.7/403-mtd_fix_cfi_cmdset_0002_status_check.patch new file mode 100644 index 0000000000..2e4c85a022 --- /dev/null +++ b/target/linux/ar71xx/patches-3.7/403-mtd_fix_cfi_cmdset_0002_status_check.patch @@ -0,0 +1,69 @@ +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c +@@ -1288,8 +1288,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); +@@ -1305,6 +1305,8 @@ static int __xipram do_write_oneword(str + + ret = -EIO; + } ++ ++ enable_xip: + xip_enable(map, chip, adr); + op_done: + chip->state = FL_READY; +@@ -1863,7 +1865,6 @@ static int cfi_amdstd_panic_write(struct + return 0; + } + +- + /* + * Handle devices with one erase region, that only implement + * the chip erase command. +@@ -1927,8 +1928,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", +@@ -1948,6 +1949,7 @@ static int __xipram do_erase_chip(struct + ret = -EIO; + } + ++ op_done: + chip->state = FL_READY; + xip_enable(map, chip, adr); + DISABLE_VPP(map); +@@ -2016,9 +2018,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)) { +@@ -2040,6 +2042,7 @@ static int __xipram do_erase_oneblock(st + ret = -EIO; + } + ++ op_done: + chip->state = FL_READY; + DISABLE_VPP(map); + put_chip(map, chip, adr); |