lantiq: add Linux 5.10 support as testing kernel
[openwrt/staging/dedeckeh.git] / target / linux / lantiq / patches-5.10 / 0101-find_active_root.patch
index d541cc247cb08f07a10d70e785dd07f34f02f460..14c33e31a6d862c72e398e69f62cf517ddfbdbb8 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/parsers/ofpart_core.c
 +++ b/drivers/mtd/parsers/ofpart_core.c
-@@ -33,6 +33,38 @@ static bool node_has_compatible(struct d
+@@ -38,6 +38,38 @@ static bool node_has_compatible(struct d
        return of_get_property(pp, "compatible", NULL);
  }
  
@@ -39,7 +39,7 @@
  static int parse_fixed_partitions(struct mtd_info *master,
                                  const struct mtd_partition **pparts,
                                  struct mtd_part_parser_data *data)
-@@ -46,6 +78,8 @@ static int parse_fixed_partitions(struct
+@@ -51,6 +83,8 @@ static int parse_fixed_partitions(struct
        struct device_node *pp;
        int nr_parts, i, ret = 0;
        bool dedicated = true;
@@ -48,7 +48,7 @@
  
        /* Pull of_node from the master device node */
        mtd_node = mtd_get_of_node(master);
-@@ -86,7 +120,9 @@ static int parse_fixed_partitions(struct
+@@ -93,7 +127,9 @@ static int parse_fixed_partitions(struct
                return 0;
  
        parts = kcalloc(nr_parts, sizeof(*parts), GFP_KERNEL);
@@ -59,9 +59,9 @@
                return -ENOMEM;
  
        i = 0;
-@@ -135,6 +171,11 @@ static int parse_fixed_partitions(struct
-               if (of_get_property(pp, "lock", &len))
-                       parts[i].mask_flags |= MTD_POWERUP_LOCK;
+@@ -145,6 +181,11 @@ static int parse_fixed_partitions(struct
+               if (of_property_read_bool(pp, "slc-mode"))
+                       parts[i].add_flags |= MTD_SLC_ON_MLC_EMULATION;
  
 +              if (!proot_id && of_device_is_compatible(pp, "brnboot,root-selector"))
 +                      proot_id = brnboot_get_selected_root_part(master, parts[i].offset);
@@ -71,7 +71,7 @@
                i++;
        }
  
-@@ -144,6 +185,11 @@ static int parse_fixed_partitions(struct
+@@ -154,6 +195,11 @@ static int parse_fixed_partitions(struct
        if (quirks && quirks->post_parse)
                quirks->post_parse(master, parts, nr_parts);
  
@@ -83,7 +83,7 @@
        *pparts = parts;
        return nr_parts;
  
-@@ -154,6 +200,7 @@ ofpart_fail:
+@@ -164,6 +210,7 @@ ofpart_fail:
  ofpart_none:
        of_node_put(pp);
        kfree(parts);