diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-05-17 18:41:25 +0200 |
---|---|---|
committer | John Crispin <john@phrozen.org> | 2018-05-18 09:10:21 +0200 |
commit | 12f44b83a8db2c95274839e2e41792e096021f29 (patch) | |
tree | 53fa8c04230702c41cb2a6bcd976e47fb828c8c5 /target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch | |
parent | 6390f27c2ed6189f6aac2308a2ea40fde2f798d7 (diff) | |
download | upstream-12f44b83a8db2c95274839e2e41792e096021f29.tar.gz upstream-12f44b83a8db2c95274839e2e41792e096021f29.tar.bz2 upstream-12f44b83a8db2c95274839e2e41792e096021f29.zip |
kernel: bump 4.9 to 4.9.100
Refreshed all patches
Added new ARM64 symbol: ARM64_ERRATUM_1024718
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch')
-rw-r--r-- | target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch index 415d835ee3..3a7fe99e65 100644 --- a/target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1630,8 +1630,8 @@ static int __xipram do_write_oneword(str +@@ -1631,8 +1631,8 @@ static int __xipram do_write_oneword(str break; } @@ -11,7 +11,7 @@ /* Latency issues. Drop the lock, wait a while and retry */ UDELAY(map, chip, adr, 1); -@@ -1647,6 +1647,8 @@ static int __xipram do_write_oneword(str +@@ -1648,6 +1648,8 @@ static int __xipram do_write_oneword(str ret = -EIO; } @@ -20,7 +20,7 @@ xip_enable(map, chip, adr); op_done: if (mode == FL_OTP_WRITE) -@@ -2225,7 +2227,6 @@ static int cfi_amdstd_panic_write(struct +@@ -2226,7 +2228,6 @@ static int cfi_amdstd_panic_write(struct return 0; } @@ -28,7 +28,7 @@ /* * Handle devices with one erase region, that only implement * the chip erase command. -@@ -2289,8 +2290,8 @@ static int __xipram do_erase_chip(struct +@@ -2291,8 +2292,8 @@ static int __xipram do_erase_chip(struct chip->erase_suspended = 0; } @@ -39,7 +39,7 @@ if (time_after(jiffies, timeo)) { printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -2310,6 +2311,7 @@ static int __xipram do_erase_chip(struct +@@ -2312,6 +2313,7 @@ static int __xipram do_erase_chip(struct ret = -EIO; } @@ -47,7 +47,7 @@ chip->state = FL_READY; xip_enable(map, chip, adr); DISABLE_VPP(map); -@@ -2378,9 +2380,9 @@ static int __xipram do_erase_oneblock(st +@@ -2381,9 +2383,9 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -59,7 +59,7 @@ } if (time_after(jiffies, timeo)) { -@@ -2402,6 +2404,7 @@ static int __xipram do_erase_oneblock(st +@@ -2405,6 +2407,7 @@ static int __xipram do_erase_oneblock(st ret = -EIO; } |