aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2016-09-03 09:27:09 +0200
committerMathias Kresin <dev@kresin.me>2016-09-03 09:27:09 +0200
commit85fefcdb61e9362abbb16eb2a9d3e6dda19a175b (patch)
tree5270d0bf35a9c33fbd7d1a4829e965879d4157a0 /target/linux/ramips/patches-4.4/0054-mtd-add-chunked-read-io-to-m25p80.patch
parentd7b6f0ea8885b45db4e435846e0fcbd822fcc8ad (diff)
downloadupstream-85fefcdb61e9362abbb16eb2a9d3e6dda19a175b.tar.gz
upstream-85fefcdb61e9362abbb16eb2a9d3e6dda19a175b.tar.bz2
upstream-85fefcdb61e9362abbb16eb2a9d3e6dda19a175b.zip
kernel: mtd: backport Macronix sector size fix
Signed-off-by: Mathias Kresin <dev@kresin.me>
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 f5a4b072cb..825f8fab94 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
-@@ -1010,6 +1010,66 @@ write_err:
+@@ -1012,6 +1012,66 @@ write_err:
return ret;
}
@@ -67,7 +67,7 @@
static int macronix_quad_enable(struct spi_nor *nor)
{
int ret, val;
-@@ -1188,10 +1248,12 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1190,10 +1250,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;
-@@ -1219,11 +1281,20 @@ int spi_nor_scan(struct spi_nor *nor, co
+@@ -1221,11 +1283,20 @@ int spi_nor_scan(struct spi_nor *nor, co
mtd->writebufsize = nor->page_size;
if (np) {