ac9bcefa3b
In the commit bde5e7a632 ("kernel: backport mtd implementation for
"compatible" in "partitions" subnode") patches that got accepted into
l2-mtd.git were backported to the kernels 4.9 and 4.14. Unfortunately
there was a regression report, patches were dropped and never reached
4.16.
This commit replaces these pseudo-backports with the latest version
that includes regression fix and futher changes that were requested.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
68 lines
2.3 KiB
Diff
68 lines
2.3 KiB
Diff
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Tue, 30 Jan 2018 12:09:58 +0100
|
|
Subject: [PATCH V10 2/3] mtd: rename "ofpart" parser to "fixed-partitions" as
|
|
it fits it better
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Type "ofpart" means that OF should be used to get partitioning info and
|
|
this driver supports "fixed-partitions" binding only. Renaming it should
|
|
lead to less confusion especially when parsers for new compatibility
|
|
strings start to appear.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
---
|
|
|
|
--- a/drivers/mtd/mtdpart.c
|
|
+++ b/drivers/mtd/mtdpart.c
|
|
@@ -932,7 +932,7 @@ static int mtd_part_of_parse(struct mtd_
|
|
struct device_node *np;
|
|
struct property *prop;
|
|
const char *compat;
|
|
- const char *fixed = "ofpart";
|
|
+ const char *fixed = "fixed-partitions";
|
|
int ret, err = 0;
|
|
|
|
np = of_get_child_by_name(mtd_get_of_node(master), "partitions");
|
|
@@ -952,7 +952,7 @@ static int mtd_part_of_parse(struct mtd_
|
|
of_node_put(np);
|
|
|
|
/*
|
|
- * For backward compatibility we have to try the "ofpart"
|
|
+ * For backward compatibility we have to try the "fixed-partitions"
|
|
* parser. It supports old DT format with partitions specified as a
|
|
* direct subnodes of a flash device DT node without any compatibility
|
|
* specified we could match.
|
|
--- a/drivers/mtd/ofpart.c
|
|
+++ b/drivers/mtd/ofpart.c
|
|
@@ -25,9 +25,9 @@ static bool node_has_compatible(struct d
|
|
return of_get_property(pp, "compatible", NULL);
|
|
}
|
|
|
|
-static int parse_ofpart_partitions(struct mtd_info *master,
|
|
- const struct mtd_partition **pparts,
|
|
- struct mtd_part_parser_data *data)
|
|
+static int parse_fixed_partitions(struct mtd_info *master,
|
|
+ const struct mtd_partition **pparts,
|
|
+ struct mtd_part_parser_data *data)
|
|
{
|
|
struct mtd_partition *parts;
|
|
struct device_node *mtd_node;
|
|
@@ -141,8 +141,8 @@ ofpart_none:
|
|
}
|
|
|
|
static struct mtd_part_parser ofpart_parser = {
|
|
- .parse_fn = parse_ofpart_partitions,
|
|
- .name = "ofpart",
|
|
+ .parse_fn = parse_fixed_partitions,
|
|
+ .name = "fixed-partitions",
|
|
};
|
|
|
|
static int parse_ofoldpart_partitions(struct mtd_info *master,
|
|
@@ -230,4 +230,5 @@ MODULE_AUTHOR("Vitaly Wool, David Gibson
|
|
* with the same name. Since we provide the ofoldpart parser, we should have
|
|
* the corresponding alias.
|
|
*/
|
|
+MODULE_ALIAS("fixed-partitions");
|
|
MODULE_ALIAS("ofoldpart");
|