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>
This commit is contained in:
Rafał Miłecki
2022-07-08 07:58:20 +02:00
parent 639419ec4f
commit 41e1e838fb
12 changed files with 174 additions and 28 deletions

View File

@@ -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
@@ -235,6 +237,146 @@ static int mtd_add_partition_attrs(struc
@@ -236,6 +238,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)
{
@@ -273,6 +415,7 @@ int mtd_add_partition(struct mtd_info *p
@@ -274,6 +416,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;
@@ -421,6 +564,7 @@ int add_mtd_partitions(struct mtd_info *
@@ -422,6 +565,7 @@ int add_mtd_partitions(struct mtd_info *
goto err_del_partitions;
}
@@ -204,7 +205,7 @@
mtd_add_partition_attrs(child);
/* Look for subpartitions */
@@ -437,31 +581,6 @@ err_del_partitions:
@@ -438,31 +582,6 @@ err_del_partitions:
return ret;
}

View File

@@ -106,7 +106,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
&dev_attr_oobsize.attr,
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -40,6 +40,7 @@ static struct mtd_info *allocate_partiti
@@ -41,6 +41,7 @@ static struct mtd_info *allocate_partiti
struct mtd_info *master = mtd_get_master(parent);
int wr_alignment = (parent->flags & MTD_NO_ERASE) ?
master->writesize : master->erasesize;
@@ -114,7 +114,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
u64 parent_size = mtd_is_partition(parent) ?
parent->part.size : parent->size;
struct mtd_info *child;
@@ -164,6 +165,7 @@ static struct mtd_info *allocate_partiti
@@ -165,6 +166,7 @@ static struct mtd_info *allocate_partiti
} else {
/* Single erase size */
child->erasesize = master->erasesize;
@@ -122,7 +122,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
}
/*
@@ -171,26 +173,39 @@ static struct mtd_info *allocate_partiti
@@ -172,26 +174,39 @@ static struct mtd_info *allocate_partiti
* exposes several regions with different erasesize. Adjust
* wr_alignment accordingly.
*/