/*
* Given a pointer to the MTD object in the mtd_part structure, we can retrieve
* the pointer to that structure.
-@@ -666,6 +670,7 @@ int mtd_add_partition(struct mtd_info *p
+@@ -650,6 +654,7 @@ int mtd_add_partition(struct mtd_info *p
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&new->mtd);
mtd_add_partition_attrs(new);
-@@ -744,6 +749,35 @@ int mtd_del_partition(struct mtd_info *m
+@@ -728,6 +733,29 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
+{
+}
+
-+void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-+ int offset, int size)
-+{
-+}
-+
+static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
+{
+ static int rootfs_found = 0;
+ if (rootfs_found)
+ return;
+
-+ if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
-+ IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE))
++ if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
++ !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
++ !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
+ split_firmware(master, part);
-+
-+ arch_split_mtd_part(master, part->mtd.name, part->offset,
-+ part->mtd.size);
+}
++
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -775,6 +809,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -759,6 +787,7 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd);
+ mtd_partition_split(master, slave);
mtd_add_partition_attrs(slave);
- if (parts[i].types)
- mtd_parse_part(slave, parts[i].types);
---- a/include/linux/mtd/partitions.h
-+++ b/include/linux/mtd/partitions.h
-@@ -110,5 +110,7 @@ int mtd_add_partition(struct mtd_info *m
- long long offset, long long length);
- int mtd_del_partition(struct mtd_info *master, int partno);
- uint64_t mtd_get_device_size(const struct mtd_info *mtd);
-+extern void __weak arch_split_mtd_part(struct mtd_info *master,
-+ const char *name, int offset, int size);
-
- #endif
+ /* Look for subpartitions */
+ parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);