aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-03-29 08:16:17 +0200
committerRafał Miłecki <rafal@milecki.pl>2021-04-08 11:25:41 +0200
commit0a98a33e099d57c6bcb55c56540242af66d2e899 (patch)
treed729c53722047050f1e9273ceae32b866be4b4e6 /target/linux/lantiq
parent64ddac2c1cdf068e66a1325eb4c4d6972a6a8b4f (diff)
downloadupstream-0a98a33e099d57c6bcb55c56540242af66d2e899.tar.gz
upstream-0a98a33e099d57c6bcb55c56540242af66d2e899.tar.bz2
upstream-0a98a33e099d57c6bcb55c56540242af66d2e899.zip
kernel: backport 5.13 mtd partitioning changes
1. Use upstream accepted NVMEM patches 2. Minor fix for BCM4908 partitioning 3. Support for Linksys firmware partitions on Northstar Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 3fd0a4222b6efbfbdb560c5b13e899ecda627494)
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-5.4/0101-find_active_root.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-5.4/0101-find_active_root.patch b/target/linux/lantiq/patches-5.4/0101-find_active_root.patch
index 201cdd3f87..6e55ef9d7a 100644
--- a/target/linux/lantiq/patches-5.4/0101-find_active_root.patch
+++ b/target/linux/lantiq/patches-5.4/0101-find_active_root.patch
@@ -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);
-@@ -88,7 +122,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,7 +59,7 @@
return -ENOMEM;
i = 0;
-@@ -137,6 +173,11 @@ static int parse_fixed_partitions(struct
+@@ -142,6 +178,11 @@ static int parse_fixed_partitions(struct
if (of_get_property(pp, "lock", &len))
parts[i].mask_flags |= MTD_POWERUP_LOCK;
@@ -71,7 +71,7 @@
i++;
}
-@@ -146,6 +187,11 @@ static int parse_fixed_partitions(struct
+@@ -151,6 +192,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;
-@@ -156,6 +202,7 @@ ofpart_fail:
+@@ -161,6 +207,7 @@ ofpart_fail:
ofpart_none:
of_node_put(pp);
kfree(parts);