aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-22 11:22:30 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-08-22 13:47:13 +0200
commit6b4ba118ac1ba1318182eb3a22864e86165f0b09 (patch)
tree4f47188239e811ae1a9ea924e2871e0726a7aff3 /target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch
parent7a9afb8783d60e16308f98efb59907aec0fdd5f7 (diff)
downloadupstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.tar.gz
upstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.tar.bz2
upstream-6b4ba118ac1ba1318182eb3a22864e86165f0b09.zip
kernel: bump 4.14 to 4.14.66
Refreshed all patches Compile-tested on: cns3xxx, imx6 Runtime-tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch')
-rw-r--r--target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch
index ddd69f17e1..b28d6c1c2d 100644
--- a/target/linux/ar71xx/patches-4.14/411-mtd-cfi_cmdset_0002-force-word-write.patch
+++ b/target/linux/ar71xx/patches-4.14/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)
-@@ -1788,6 +1792,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)
-@@ -1916,7 +1921,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)
{
-@@ -1991,6 +1995,7 @@ static int cfi_amdstd_write_buffers(stru
+@@ -1995,6 +1999,7 @@ static int cfi_amdstd_write_buffers(stru
return 0;
}