aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-02-08 15:42:42 +0000
committerLuka Perkov <luka@openwrt.org>2015-02-08 15:42:42 +0000
commit4b0fbf30726cf6807508b7025fef023439e07572 (patch)
treed1eb7cd69c5d7d1371ec053c2788b3287e6a8d16 /target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch
parent6b8f598ca648505d49993da4fbdbb4268b8aee10 (diff)
downloadupstream-4b0fbf30726cf6807508b7025fef023439e07572.tar.gz
upstream-4b0fbf30726cf6807508b7025fef023439e07572.tar.bz2
upstream-4b0fbf30726cf6807508b7025fef023439e07572.zip
ramips: fix patches after 3.14.32 bump
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44324
Diffstat (limited to 'target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch')
-rw-r--r--target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch
index 4031335b22..6aee4ad2ab 100644
--- a/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch
+++ b/target/linux/ramips/patches-3.14/0044-mtd-add-chunked-read-io-to-m25p80.patch
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/*
* Write an address range to the flash chip. Data must be written in
* FLASH_PAGESIZE chunks. The address range may be any size provided
-@@ -596,11 +680,8 @@ static int m25p80_write(struct mtd_info
+@@ -596,11 +680,8 @@ static int m25p80_write(struct mtd_info
return 1;
}
@@ -121,7 +121,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
page_offset = to & (flash->page_size - 1);
-@@ -608,9 +689,7 @@ static int m25p80_write(struct mtd_info
+@@ -608,9 +689,7 @@ static int m25p80_write(struct mtd_info
if (page_offset + len <= flash->page_size) {
t[1].len = len;
@@ -132,7 +132,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
} else {
u32 i;
-@@ -618,9 +697,7 @@ static int m25p80_write(struct mtd_info
+@@ -618,9 +697,7 @@ static int m25p80_write(struct mtd_info
page_size = flash->page_size - page_offset;
t[1].len = page_size;
@@ -143,7 +143,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/* write everything in flash->page_size chunks */
for (i = page_size; i < len; i += page_size) {
-@@ -628,19 +705,12 @@ static int m25p80_write(struct mtd_info
+@@ -628,19 +705,12 @@ static int m25p80_write(struct mtd_info
if (page_size > flash->page_size)
page_size = flash->page_size;
@@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
}
}
-@@ -1105,6 +1175,7 @@ static int m25p_probe(struct spi_device
+@@ -1105,6 +1175,7 @@ static int m25p_probe(struct spi_device
struct mtd_part_parser_data ppdata;
struct device_node *np = spi->dev.of_node;
int ret;
@@ -172,7 +172,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/* Platform data helps sort out which chip type we have, as
* well as how this board partitions it. If we don't have
-@@ -1187,6 +1258,12 @@ static int m25p_probe(struct spi_device
+@@ -1187,6 +1258,12 @@ static int m25p_probe(struct spi_device
flash->mtd._erase = m25p80_erase;
flash->mtd._read = m25p80_read;