aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-08-17 06:17:37 +0000
committerJohn Crispin <blogic@openwrt.org>2015-08-17 06:17:37 +0000
commita44d24b7952cd6107c653d764270df8f71ca2451 (patch)
tree66d4d3f2e1c4371e19ccbe7d43156491f4937865 /target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch
parentd1c6d2713c8ab33101f5c61dc224ec17b22305be (diff)
downloadmaster-187ad058-a44d24b7952cd6107c653d764270df8f71ca2451.tar.gz
master-187ad058-a44d24b7952cd6107c653d764270df8f71ca2451.tar.bz2
master-187ad058-a44d24b7952cd6107c653d764270df8f71ca2451.zip
kernel: move linux, part-probe dt parsing in generic code
The "linux,part-probe" dts parsing is a pretty neat generic feature. It has been posted to kernel.org and could easily be reused by all targets. This change moves the patch to the 3.18 and 4.1 generic folders, and makes the feature available to all platforms who may want to use it. Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org> Acked-by: Hauke Mehrtens <hauke@hauke-m.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46654 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch')
-rw-r--r--target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch
index a66507bc81..e6e809cf3c 100644
--- a/target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch
+++ b/target/linux/generic/patches-4.1/411-mtd-partial_eraseblock_write.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -36,6 +36,8 @@
+@@ -37,6 +37,8 @@
#include "mtdcore.h"
#include "mtdsplit/mtdsplit.h"
@@ -9,7 +9,7 @@
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
static DEFINE_MUTEX(mtd_partitions_mutex);
-@@ -234,13 +236,61 @@ static int part_erase(struct mtd_info *m
+@@ -235,13 +237,61 @@ static int part_erase(struct mtd_info *m
struct mtd_part *part = PART(mtd);
int ret;
@@ -71,7 +71,7 @@
return ret;
}
-@@ -248,7 +298,25 @@ void mtd_erase_callback(struct erase_inf
+@@ -249,7 +299,25 @@ void mtd_erase_callback(struct erase_inf
{
if (instr->mtd->_erase == part_erase) {
struct mtd_part *part = PART(instr->mtd);
@@ -97,7 +97,7 @@
if (instr->fail_addr != MTD_FAIL_ADDR_UNKNOWN)
instr->fail_addr -= part->offset;
instr->addr -= part->offset;
-@@ -521,17 +589,20 @@ static struct mtd_part *allocate_partiti
+@@ -522,17 +590,20 @@ static struct mtd_part *allocate_partiti
if ((slave->mtd.flags & MTD_WRITEABLE) &&
mtd_mod_by_eb(slave->offset, &slave->mtd)) {
/* Doesn't start on a boundary of major erase size */