aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-03-12 18:30:01 +0100
committerRafał Miłecki <rafal@milecki.pl>2021-03-17 21:24:22 +0100
commit6a217d6d72fff766fc0c8fcf73905fad5fde8fc5 (patch)
tree40ddcf4b9934a282bfd3eedf79125c0fad677418 /target/linux/lantiq
parentc8b415035cb6414774a83f703ff709371f7089c0 (diff)
downloadupstream-6a217d6d72fff766fc0c8fcf73905fad5fde8fc5.tar.gz
upstream-6a217d6d72fff766fc0c8fcf73905fad5fde8fc5.tar.bz2
upstream-6a217d6d72fff766fc0c8fcf73905fad5fde8fc5.zip
kernel: add pending mtd patches adding NVMEM support
It's meant to provide upstream support for mtd & NVMEM. It's required e.g. for reading MAC address from mtd partition content. It seems to be in a final shape so it's worth testing. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit e90e75b12c818c49704755b9e530491aee2d554c)
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/patches-5.4/0101-find_active_root.patch8
1 files changed, 4 insertions, 4 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 d541cc247c..201cdd3f87 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
@@ -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
+@@ -88,7 +122,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;
-@@ -135,6 +171,11 @@ static int parse_fixed_partitions(struct
+@@ -137,6 +173,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++;
}
-@@ -144,6 +185,11 @@ static int parse_fixed_partitions(struct
+@@ -146,6 +187,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:
+@@ -156,6 +202,7 @@ ofpart_fail:
ofpart_none:
of_node_put(pp);
kfree(parts);