aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-4.14
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm63xx/patches-4.14')
-rw-r--r--target/linux/brcm63xx/patches-4.14/119-Revert-mtd-partitions-use-DT-info-for-parsing-partit.patch81
1 files changed, 81 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-4.14/119-Revert-mtd-partitions-use-DT-info-for-parsing-partit.patch b/target/linux/brcm63xx/patches-4.14/119-Revert-mtd-partitions-use-DT-info-for-parsing-partit.patch
new file mode 100644
index 0000000000..073a8a45f6
--- /dev/null
+++ b/target/linux/brcm63xx/patches-4.14/119-Revert-mtd-partitions-use-DT-info-for-parsing-partit.patch
@@ -0,0 +1,81 @@
+From e62ff8f02eb3ae35ae7ece7c5272a689fd8b0bcd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Fri, 27 Jul 2018 21:37:48 +0200
+Subject: [PATCH] Revert "mtd: partitions: use DT info for parsing partitions
+ with "compatible" prop"
+
+This reverts commit 76a832254ab05502c9394cc51ded6f0abe0e0bee.
+---
+ drivers/mtd/mtdpart.c | 33 ++++++++++++++++++++-------------
+ 1 file changed, 20 insertions(+), 13 deletions(-)
+
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -453,6 +453,22 @@ static inline void free_partition(struct
+ kfree(p);
+ }
+
++/**
++ * mtd_parse_part - parse MTD partition looking for subpartitions
++ *
++ * @slave: part that is supposed to be a container and should be parsed
++ * @types: NULL-terminated array with names of partition parsers to try
++ *
++ * Some partitions are kind of containers with extra subpartitions (volumes).
++ * There can be various formats of such containers. This function tries to use
++ * specified parsers to analyze given partition and registers found
++ * subpartitions on success.
++ */
++static int mtd_parse_part(struct mtd_part *slave, const char *const *types)
++{
++ return parse_mtd_partitions(&slave->mtd, types, NULL);
++}
++
+ static struct mtd_part *allocate_partition(struct mtd_info *parent,
+ const struct mtd_partition *part, int partno,
+ uint64_t cur_offset)
+@@ -932,8 +948,8 @@ int add_mtd_partitions(struct mtd_info *
+ add_mtd_device(&slave->mtd);
+ mtd_partition_split(master, slave);
+ mtd_add_partition_attrs(slave);
+- /* Look for subpartitions */
+- parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
++ if (parts[i].types)
++ mtd_parse_part(slave, parts[i].types);
+
+ cur_offset = slave->offset + slave->mtd.size;
+ }
+@@ -1035,12 +1051,6 @@ static const char * const default_mtd_pa
+ NULL
+ };
+
+-/* Check DT only when looking for subpartitions. */
+-static const char * const default_subpartition_types[] = {
+- "ofpart",
+- NULL
+-};
+-
+ static int mtd_part_do_parse(struct mtd_part_parser *parser,
+ struct mtd_info *master,
+ struct mtd_partitions *pparts,
+@@ -1111,9 +1121,7 @@ static int mtd_part_of_parse(struct mtd_
+ const char *fixed = "fixed-partitions";
+ int ret, err = 0;
+
+- np = mtd_get_of_node(master);
+- if (!mtd_is_partition(master))
+- np = of_get_child_by_name(np, "partitions");
++ np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
+ of_property_for_each_string(np, "compatible", prop, compat) {
+ parser = mtd_part_get_compatible_parser(compat);
+ if (!parser)
+@@ -1183,8 +1191,7 @@ int parse_mtd_partitions(struct mtd_info
+ }
+
+ if (!types)
+- types = mtd_is_partition(master) ? default_subpartition_types :
+- default_mtd_part_types;
++ types = default_mtd_part_types;
+
+ for ( ; *types; types++) {
+ /*