Skip to content

Commit

Permalink
mtd: physmap_of: allow to specify the mtd name for retro compatiblity
Browse files Browse the repository at this point in the history
linux,mtd-name allow to specify the mtd name for retro capability with
physmap-flash drivers as boot loader pass the mtd partition via the old
device name physmap-flash.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  • Loading branch information
Jean-Christophe PLAGNIOL-VILLARD authored and Artem Bityutskiy committed Nov 16, 2012
1 parent d6ba745 commit d68cbdd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/mtd/mtd-physmap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ file systems on embedded devices.
unaligned accesses as implemented in the JFFS2 code via memcpy().
By defining "no-unaligned-direct-access", the flash will not be
exposed directly to the MTD users (e.g. JFFS2) any more.
- linux,mtd-name: allow to specify the mtd name for retro capability with
physmap-flash drivers as boot loader pass the mtd partition via the old
device name physmap-flash.

For JEDEC compatible devices, the following additional properties
are defined:
Expand Down
5 changes: 4 additions & 1 deletion drivers/mtd/maps/physmap_of.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ static int __devinit of_flash_probe(struct platform_device *dev)
resource_size_t res_size;
struct mtd_part_parser_data ppdata;
bool map_indirect;
const char *mtd_name;

match = of_match_device(of_flash_match, &dev->dev);
if (!match)
Expand All @@ -178,6 +179,8 @@ static int __devinit of_flash_probe(struct platform_device *dev)

reg_tuple_size = (of_n_addr_cells(dp) + of_n_size_cells(dp)) * sizeof(u32);

of_property_read_string(dp, "linux,mtd-name", &mtd_name);

/*
* Get number of "reg" tuples. Scan for MTD devices on area's
* described by each "reg" region. This makes it possible (including
Expand Down Expand Up @@ -234,7 +237,7 @@ static int __devinit of_flash_probe(struct platform_device *dev)
goto err_out;
}

info->list[i].map.name = dev_name(&dev->dev);
info->list[i].map.name = mtd_name ?: dev_name(&dev->dev);
info->list[i].map.phys = res.start;
info->list[i].map.size = res_size;
info->list[i].map.bankwidth = be32_to_cpup(width);
Expand Down

0 comments on commit d68cbdd

Please sign in to comment.