![Chuanhong Guo](/assets/img/avatar_default.png)
The following patches are dropped because they are merged upstream: -0001-tty-serial-drop-QCA-pecific-SoC-symbols.patch -0006-usb-drop-deprecated-symbols.patch -0009-MIPS-ath79-add-lots-of-missing-registers.patch -0010-MIPS-ath79-add-support-for-QCA953x-QCA956x-TP9343.patch -0014-MIPS-ath79-finetune-cpu-overrides.patch -0015-MIPS-ath79-enable-uart-during-early_prink.patch -0016-MIPS-ath79-get-PCIe-controller-out-of-reset.patch This patch is dropped due to the introduction of spi-mem framework: -461-spi-ath79-add-fast-flash-read.patch Thank to Michael Marley @mamarley for his work on this patch: -910-unaligned_access_hacks.patch Signed-off-by: Chuanhong Guo <gch981213@gmail.com> [synchronized kernel config with make kernel_oldconfig] Signed-off-by: Petr Štetiar <ynezz@true.cz>
65 lines
1.5 KiB
Diff
65 lines
1.5 KiB
Diff
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
@@ -1634,8 +1634,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);
|
|
@@ -1651,6 +1651,8 @@ static int __xipram do_write_oneword(str
|
|
|
|
ret = -EIO;
|
|
}
|
|
+
|
|
+ enable_xip:
|
|
xip_enable(map, chip, adr);
|
|
op_done:
|
|
if (mode == FL_OTP_WRITE)
|
|
@@ -2229,7 +2231,6 @@ static int cfi_amdstd_panic_write(struct
|
|
return 0;
|
|
}
|
|
|
|
-
|
|
/*
|
|
* Handle devices with one erase region, that only implement
|
|
* the chip erase command.
|
|
@@ -2297,7 +2298,7 @@ static int __xipram do_erase_chip(struct
|
|
}
|
|
|
|
if (chip_good(map, adr, map_word_ff(map)))
|
|
- break;
|
|
+ goto op_done;
|
|
|
|
if (time_after(jiffies, timeo)) {
|
|
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
|
@@ -2321,6 +2322,7 @@ static int __xipram do_erase_chip(struct
|
|
}
|
|
}
|
|
|
|
+ op_done:
|
|
chip->state = FL_READY;
|
|
xip_enable(map, chip, adr);
|
|
DISABLE_VPP(map);
|
|
@@ -2393,7 +2395,7 @@ static int __xipram do_erase_oneblock(st
|
|
}
|
|
|
|
if (chip_good(map, adr, map_word_ff(map)))
|
|
- break;
|
|
+ goto op_done;
|
|
|
|
if (time_after(jiffies, timeo)) {
|
|
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
|
@@ -2417,6 +2419,7 @@ static int __xipram do_erase_oneblock(st
|
|
}
|
|
}
|
|
|
|
+ op_done:
|
|
chip->state = FL_READY;
|
|
xip_enable(map, chip, adr);
|
|
DISABLE_VPP(map);
|