aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-07-27 21:54:08 +0200
committerRafał Miłecki <rafal@milecki.pl>2018-07-31 10:14:47 +0200
commitb5b5f5dfa64519120369c5f5d26ba922c9fbcd4f (patch)
tree541b990524050299fc323d8a27a5b20b72249b5b /target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
parentf8e57f450dad5d5e7f40f24158472bda0896f6f5 (diff)
downloadupstream-b5b5f5dfa64519120369c5f5d26ba922c9fbcd4f.tar.gz
upstream-b5b5f5dfa64519120369c5f5d26ba922c9fbcd4f.tar.bz2
upstream-b5b5f5dfa64519120369c5f5d26ba922c9fbcd4f.zip
kernel: backport mtd support for subpartitions in DT
This is a new & warm feature that allows nesting partiitons in DT and mixing their types (e.g. static vs. dynamic). It's very useful for boards that have most partitions static but some of them require extra parsing (e.g. a "firmware" partition). It's required to successfully backport support for new devices using that new syntax in their DT files. Since brcm63xx has a custom alternative patch the upstream one is being reverted for it. The plan is to make brcm63xx use the upstream implementation. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 2a598bbaa3f75b7051c2453a6ccf706191cf2153)
Diffstat (limited to 'target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch')
-rw-r--r--target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
index 0e858d93bb..80ff556a49 100644
--- a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
+++ b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
@@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
#include <linux/err.h>
#include <linux/of.h>
-@@ -851,6 +852,32 @@ void deregister_mtd_parser(struct mtd_pa
+@@ -835,6 +836,32 @@ void deregister_mtd_parser(struct mtd_pa
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
/*
@@ -137,7 +137,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* Do not forget to update 'parse_mtd_partitions()' kerneldoc comment if you
* are changing this array!
*/
-@@ -991,6 +1018,13 @@ int parse_mtd_partitions(struct mtd_info
+@@ -983,6 +1010,13 @@ int parse_mtd_partitions(struct mtd_info
struct mtd_partitions pparts = { };
struct mtd_part_parser *parser;
int ret, err = 0;
@@ -150,8 +150,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+ }
if (!types)
- types = default_mtd_part_types;
-@@ -1031,6 +1065,7 @@ int parse_mtd_partitions(struct mtd_info
+ types = mtd_is_partition(master) ? default_subpartition_types :
+@@ -1024,6 +1058,7 @@ int parse_mtd_partitions(struct mtd_info
if (ret < 0 && !err)
err = ret;
}