aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2022-07-08 07:58:20 +0200
committerRafał Miłecki <rafal@milecki.pl>2022-09-03 20:56:06 +0200
commit8835da4d9047cb11d6267b59cf414bd4de3984bc (patch)
tree58084cb2f6a414bf7a18d29516be5417d8abbfeb /target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
parent510f0628c70b0eaa278b01d0d77c0cdf97322c24 (diff)
downloadupstream-8835da4d9047cb11d6267b59cf414bd4de3984bc.tar.gz
upstream-8835da4d9047cb11d6267b59cf414bd4de3984bc.tar.bz2
upstream-8835da4d9047cb11d6267b59cf414bd4de3984bc.zip
kernel: backport mtd patch adding of_platform_populate() calls
This is required for non-parser drivers handling MTD devices. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 41e1e838fbbb0308ad7353a3714e04b8c4585e7e)
Diffstat (limited to 'target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch')
-rw-r--r--target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch b/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
index 42043a2818..f37df6d164 100644
--- a/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
+++ b/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
@@ -28,20 +28,21 @@
depends on m
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
-@@ -15,10 +15,12 @@
+@@ -15,11 +15,13 @@
#include <linux/kmod.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
+#include <linux/magic.h>
#include <linux/err.h>
#include <linux/of.h>
+ #include <linux/of_platform.h>
#include "mtdcore.h"
+#include "mtdsplit/mtdsplit.h"
/*
* MTD methods which simply translate the effective address and pass through
-@@ -236,6 +238,146 @@ static int mtd_add_partition_attrs(struc
+@@ -237,6 +239,146 @@ static int mtd_add_partition_attrs(struc
return ret;
}
@@ -188,7 +189,7 @@
int mtd_add_partition(struct mtd_info *parent, const char *name,
long long offset, long long length)
{
-@@ -274,6 +416,7 @@ int mtd_add_partition(struct mtd_info *p
+@@ -275,6 +417,7 @@ int mtd_add_partition(struct mtd_info *p
if (ret)
goto err_remove_part;
@@ -196,7 +197,7 @@
mtd_add_partition_attrs(child);
return 0;
-@@ -422,6 +565,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -423,6 +566,7 @@ int add_mtd_partitions(struct mtd_info *
goto err_del_partitions;
}
@@ -204,7 +205,7 @@
mtd_add_partition_attrs(child);
/* Look for subpartitions */
-@@ -438,31 +582,6 @@ err_del_partitions:
+@@ -439,31 +583,6 @@ err_del_partitions:
return ret;
}