aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-08-17 06:17:37 +0000
committerJohn Crispin <john@openwrt.org>2015-08-17 06:17:37 +0000
commit6856535e290aefcebd257b19a6b7d8d9c70c1171 (patch)
treee75734c6f31448927dacf3c9975396af3ba1377f /target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
parente83643d31c2364166f411e7a1bb8c183489705c0 (diff)
downloadupstream-6856535e290aefcebd257b19a6b7d8d9c70c1171.tar.gz
upstream-6856535e290aefcebd257b19a6b7d8d9c70c1171.tar.bz2
upstream-6856535e290aefcebd257b19a6b7d8d9c70c1171.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> SVN-Revision: 46654
Diffstat (limited to 'target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch')
-rw-r--r--target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch b/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
index 7692d3dd42..5d5c6ed5d3 100644
--- a/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
+++ b/target/linux/generic/patches-3.18/411-mtd-partial_eraseblock_write.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -35,6 +35,8 @@
+@@ -36,6 +36,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);
-@@ -233,13 +235,61 @@ static int part_erase(struct mtd_info *m
+@@ -234,13 +236,61 @@ static int part_erase(struct mtd_info *m
struct mtd_part *part = PART(mtd);
int ret;
@@ -71,7 +71,7 @@
return ret;
}
-@@ -247,7 +297,25 @@ void mtd_erase_callback(struct erase_inf
+@@ -248,7 +298,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;
-@@ -514,17 +582,20 @@ static struct mtd_part *allocate_partiti
+@@ -515,17 +583,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 */