Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0faf434 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Boris Brezillon
Browse files

mtd: rename "ofpart" parser to "fixed-partitions" as it fits it better 



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: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent 5b644aa0

drivers/mtd/mtdpart.c

+2 −2
Original line number Diff line number Diff line
@@ -892,7 +892,7 @@ static int mtd_part_of_parse(struct mtd_info *master, 
	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");
@@ -912,7 +912,7 @@ static int mtd_part_of_parse(struct mtd_info *master, 
	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.

drivers/mtd/ofpart.c

+6 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static bool node_has_compatible(struct device_node *pp) 
	return of_get_property(pp, "compatible", NULL);

}



static int parse_ofpart_partitions(struct mtd_info *master,

static int parse_fixed_partitions(struct mtd_info *master,

				  const struct mtd_partition **pparts,

				  struct mtd_part_parser_data *data)

{
@@ -141,8 +141,8 @@ static int parse_ofpart_partitions(struct mtd_info *master, 
}



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,
@@ -229,4 +229,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");