diff options
| author | Etienne Haarsma <bladeoner112@gmail.com> | 2018-05-05 18:50:42 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-05-07 07:58:33 +0200 |
| commit | e8b1af45f8b2883e76f5d491c2fda2fca20c5634 (patch) | |
| tree | d681b02c5305d30e79f0af0f986e6407e9d39c69 /target/linux/ar71xx | |
| parent | 999bb66b20b03c753801ecebf1ec2a03c6a63c96 (diff) | |
| download | upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.gz upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.tar.bz2 upstream-e8b1af45f8b2883e76f5d491c2fda2fca20c5634.zip | |
kernel: bump kernel 4.4 to 4.4.131 for 17.01
* Refreshed patches
Compile-tested: ar71xx
Run-tested: ar71xx
Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch | 14 | ||||
| -rw-r--r-- | target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch index 1ccce4ecec..8f41d9432c 100644 --- a/target/linux/ar71xx/patches-4.4/403-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-4.4/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 -@@ -1632,8 +1632,8 @@ static int __xipram do_write_oneword(str +@@ -1633,8 +1633,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); -@@ -1649,6 +1649,8 @@ static int __xipram do_write_oneword(str +@@ -1650,6 +1650,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) -@@ -2227,7 +2229,6 @@ static int cfi_amdstd_panic_write(struct +@@ -2228,7 +2230,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. -@@ -2291,8 +2292,8 @@ static int __xipram do_erase_chip(struct +@@ -2293,8 +2294,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", -@@ -2312,6 +2313,7 @@ static int __xipram do_erase_chip(struct +@@ -2314,6 +2315,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); -@@ -2380,9 +2382,9 @@ static int __xipram do_erase_oneblock(st +@@ -2383,9 +2385,9 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -59,7 +59,7 @@ } if (time_after(jiffies, timeo)) { -@@ -2404,6 +2406,7 @@ static int __xipram do_erase_oneblock(st +@@ -2407,6 +2409,7 @@ static int __xipram do_erase_oneblock(st ret = -EIO; } diff --git a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch index 39c5478182..28c6ad875d 100644 --- a/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-4.4/411-mtd-cfi_cmdset_0002-force-word-write.patch @@ -35,7 +35,7 @@ /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd) -@@ -1791,6 +1795,7 @@ static int cfi_amdstd_write_words(struct +@@ -1792,6 +1796,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1919,7 +1924,6 @@ static int __xipram do_write_buffer(stru +@@ -1920,7 +1925,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1994,6 +1998,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -1995,6 +1999,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } |