kernel: backport mtd support for subpartitions in DT

[openwrt/openwrt.git] / target / linux / generic / pending-4.14 / 402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch

diff --git a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
index cfd178e42d14e8ede73c0b9ae277a60ea57eed53..f93b816a3811b7fafc7f2f537d5fee195705479c 100644 (file)
--- a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
+++ b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -757,6 +757,36 @@ int mtd_del_partition(struct mtd_info *m
+@@ -741,6 +741,36 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -47,7 +47,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
  #define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
  #else
-@@ -765,6 +795,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition);
+@@ -749,6 +779,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition);
  
  static void split_firmware(struct mtd_info *master, struct mtd_part *part)
  {
@@ -55,7 +55,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  }
  
  void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-@@ -779,6 +810,12 @@ static void mtd_partition_split(struct m
+@@ -763,6 +794,12 @@ static void mtd_partition_split(struct m
        if (rootfs_found)
                return;