kernel: backport mtd patch adding of_platform_populate() calls

[openwrt/staging/dedeckeh.git] / target / linux / generic / pending-5.15 / 400-mtd-mtdsplit-support.patch

diff --git a/target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch b/target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch
index 1acb8d718fafe0f635da01f846d260f814172bfd..461341ce769f1e56986b454df88ca7ce21335492 100644 (file)
--- a/target/linux/generic/pending-5.15/400-mtd-mtdsplit-support.patch
+++ b/target/linux/generic/pending-5.15/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
-@@ -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;
  }