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

Commit 529688fe authored by Jonas Gorski's avatar Jonas Gorski Committed by David Woodhouse
Browse files

mtd: maps: physmap: allow partition parsers for physmap_flash_data 



Arch setup code might want to use their own partition parsers, but still
use the generic physmap flash driver.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Acked-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 70a3c167

drivers/mtd/maps/physmap.c

+4 −1
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static int physmap_flash_probe(struct platform_device *dev) 
	struct physmap_flash_data *physmap_data;

	struct physmap_flash_info *info;

	const char **probe_type;

	const char **part_types;

	int err = 0;

	int i;

	int devices_found = 0;
@@ -171,7 +172,9 @@ static int physmap_flash_probe(struct platform_device *dev) 
	if (err)

		goto err_out;



	mtd_device_parse_register(info->cmtd, part_probe_types, 0,

	part_types = physmap_data->part_probe_types ? : part_probe_types;



	mtd_device_parse_register(info->cmtd, part_types, 0,

				  physmap_data->parts, physmap_data->nr_parts);

	return 0;

include/linux/mtd/physmap.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct physmap_flash_data { 
	unsigned int		pfow_base;

	char                    *probe_type;

	struct mtd_partition	*parts;

	const char		**part_probe_types;

};



#endif /* __LINUX_MTD_PHYSMAP__ */