diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2011-12-05 16:08:09 +0100 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-01-09 18:16:15 +0000 |
| commit | 529688fed64a7759323cbd170754c61aad0dd48b (patch) | |
| tree | 266489686039572f5bfb630d0dbe4c1cc42120df | |
| parent | 70a3c167c4bf38b5ffd07d8506230ecc20ef7ab1 (diff) | |
| download | linux-3.10-529688fed64a7759323cbd170754c61aad0dd48b.tar.gz linux-3.10-529688fed64a7759323cbd170754c61aad0dd48b.tar.bz2 linux-3.10-529688fed64a7759323cbd170754c61aad0dd48b.zip | |
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: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| -rw-r--r-- | drivers/mtd/maps/physmap.c | 5 | ||||
| -rw-r--r-- | include/linux/mtd/physmap.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 66e8200079c..1f749d58ae6 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -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; diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h index 04e018160e2..d2887e76b7f 100644 --- a/include/linux/mtd/physmap.h +++ b/include/linux/mtd/physmap.h @@ -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__ */ |