From 8835da4d9047cb11d6267b59cf414bd4de3984bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 8 Jul 2022 07:58:20 +0200 Subject: kernel: backport mtd patch adding of_platform_populate() calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is required for non-parser drivers handling MTD devices. Signed-off-by: Rafał Miłecki (cherry picked from commit 41e1e838fbbb0308ad7353a3714e04b8c4585e7e) --- .../linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch') 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 #include #include +#include #include #include + #include #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; } -- cgit v1.2.3