aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
diff options
context:
space:
mode:
authorStijn Segers <francesco.borromini@inventati.org>2016-11-01 12:21:15 +0100
committerJohn Crispin <john@phrozen.org>2016-11-02 10:25:44 +0100
commit2f2ea7b44c6affb24426759b93d45d0aa26a74d5 (patch)
tree1bc9b86fd9b7cabf56a53b816615d20748073648 /target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
parenteefe07ef4dccfb5463be9350239a89731ba46a3c (diff)
downloadupstream-2f2ea7b44c6affb24426759b93d45d0aa26a74d5.tar.gz
upstream-2f2ea7b44c6affb24426759b93d45d0aa26a74d5.tar.bz2
upstream-2f2ea7b44c6affb24426759b93d45d0aa26a74d5.zip
kernel: update kernel 4.4 to version 4.4.30
This patch bumps the 4.4 kernel from .28 to .30 and refreshes the patches. Compile-tested on ar71xx, x86/64, ramips/mt7621, brcm47xx and kirkwood. Run-tested on ar71xx & ramips/mt7621, brcm47xx and kirkwood (last two confirmed by P. Wassi). Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
Diffstat (limited to 'target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch')
-rw-r--r--target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
index 825f8fab94..a87d5cd25b 100644
--- a/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
+++ b/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1012,6 +1012,66 @@ write_err:
+@@ -1013,6 +1013,66 @@ write_err:
return ret;
}
@@ -67,7 +67,7 @@
static int macronix_quad_enable(struct spi_nor *nor)
{
int ret, val;
-@@ -1190,10 +1250,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1191,10 +1251,12 @@ int spi_nor_scan(struct spi_nor *nor, co
}
/* sst nor chips use AAI word program */
@@ -82,7 +82,7 @@
if (info->flags & USE_FSR)
nor->flags |= SNOR_F_USE_FSR;
-@@ -1221,11 +1283,20 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1222,11 +1284,20 @@ int spi_nor_scan(struct spi_nor *nor, co
mtd->writebufsize = nor->page_size;
if (np) {