| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394 |
- --- a/drivers/mtd/maps/physmap.c
- +++ b/drivers/mtd/maps/physmap.c
- @@ -31,6 +31,66 @@ struct physmap_flash_info {
- int vpp_refcnt;
- };
-
- +static struct platform_device *physmap_map2pdev(struct map_info *map)
- +{
- + return (struct platform_device *) map->map_priv_1;
- +}
- +
- +static void physmap_lock(struct map_info *map)
- +{
- + struct platform_device *pdev;
- + struct physmap_flash_data *physmap_data;
- +
- + pdev = physmap_map2pdev(map);
- + physmap_data = pdev->dev.platform_data;
- + physmap_data->lock(pdev);
- +}
- +
- +static void physmap_unlock(struct map_info *map)
- +{
- + struct platform_device *pdev;
- + struct physmap_flash_data *physmap_data;
- +
- + pdev = physmap_map2pdev(map);
- + physmap_data = pdev->dev.platform_data;
- + physmap_data->unlock(pdev);
- +}
- +
- +static map_word physmap_flash_read_lock(struct map_info *map, unsigned long ofs)
- +{
- + map_word ret;
- +
- + physmap_lock(map);
- + ret = inline_map_read(map, ofs);
- + physmap_unlock(map);
- +
- + return ret;
- +}
- +
- +static void physmap_flash_write_lock(struct map_info *map, map_word d,
- + unsigned long ofs)
- +{
- + physmap_lock(map);
- + inline_map_write(map, d, ofs);
- + physmap_unlock(map);
- +}
- +
- +static void physmap_flash_copy_from_lock(struct map_info *map, void *to,
- + unsigned long from, ssize_t len)
- +{
- + physmap_lock(map);
- + inline_map_copy_from(map, to, from, len);
- + physmap_unlock(map);
- +}
- +
- +static void physmap_flash_copy_to_lock(struct map_info *map, unsigned long to,
- + const void *from, ssize_t len)
- +{
- + physmap_lock(map);
- + inline_map_copy_to(map, to, from, len);
- + physmap_unlock(map);
- +}
- +
- static int physmap_flash_remove(struct platform_device *dev)
- {
- struct physmap_flash_info *info;
- @@ -153,6 +213,13 @@ static int physmap_flash_probe(struct pl
-
- simple_map_init(&info->map[i]);
-
- + if (physmap_data->lock && physmap_data->unlock) {
- + info->map[i].read = physmap_flash_read_lock;
- + info->map[i].write = physmap_flash_write_lock;
- + info->map[i].copy_from = physmap_flash_copy_from_lock;
- + info->map[i].copy_to = physmap_flash_copy_to_lock;
- + }
- +
- probe_type = rom_probe_types;
- if (physmap_data->probe_type == NULL) {
- for (; info->mtd[i] == NULL && *probe_type != NULL; probe_type++)
- --- a/include/linux/mtd/physmap.h
- +++ b/include/linux/mtd/physmap.h
- @@ -25,6 +25,8 @@ struct physmap_flash_data {
- unsigned int width;
- int (*init)(struct platform_device *);
- void (*exit)(struct platform_device *);
- + void (*lock)(struct platform_device *);
- + void (*unlock)(struct platform_device *);
- void (*set_vpp)(struct platform_device *, int);
- unsigned int nr_parts;
- unsigned int pfow_base;
|
