kernel: backport mtd support for subpartitions in DT

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-4.14 / 120-mtd-add-of_match_table-parsing-for-partition-parsers.patch

diff --git a/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch b/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch
index 2e663259d1081dccb3ab6095745cb1adbfa33ff7..b9009bbee75dd7d34a90dd152664530a14519456 100644 (file)
--- a/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch
+++ b/target/linux/brcm63xx/patches-4.14/120-mtd-add-of_match_table-parsing-for-partition-parsers.patch
@@ -42,7 +42,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -961,8 +961,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -948,8 +948,7 @@ int add_mtd_partitions(struct mtd_info *
                add_mtd_device(&slave->mtd);
                mtd_partition_split(master, slave);
                mtd_add_partition_attrs(slave);
@@ -52,7 +52,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  
                cur_offset = slave->offset + slave->mtd.size;
        }
-@@ -1134,7 +1133,9 @@ static int mtd_part_of_parse(struct mtd_
+@@ -1121,7 +1120,9 @@ static int mtd_part_of_parse(struct mtd_
        const char *fixed = "fixed-partitions";
        int ret, err = 0;
  
@@ -63,7 +63,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
        of_property_for_each_string(np, "compatible", prop, compat) {
                parser = mtd_part_get_compatible_parser(compat);
                if (!parser)
-@@ -1206,8 +1207,12 @@ int parse_mtd_partitions(struct mtd_info
+@@ -1190,8 +1191,12 @@ int parse_mtd_partitions(struct mtd_info
                        types = types_of;
        }