diff options
| author | Murali Karicheri <m-karicheri2@ti.com> | 2012-02-12 10:11:21 -0500 |
|---|---|---|
| committer | Cyril Chemparathy <cyril@ti.com> | 2012-09-21 10:44:00 -0400 |
| commit | 0668219e4c3f86177f9d80ec9c8cf2ecad7e65ed (patch) | |
| tree | 88b6ed75b6e8b3b310583c7639f019b86f096906 | |
| parent | 01fa07cb8dbab0c775042f42648cc795842264bc (diff) | |
| download | linux-keystone-0668219e4c3f86177f9d80ec9c8cf2ecad7e65ed.tar.gz | |
of: adding devres version of of_iomap
This adds devres version of the of_iomap() to allow resource to be cleaned
through devres.
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
| -rw-r--r-- | drivers/of/address.c | 30 | ||||
| -rw-r--r-- | include/linux/of_address.h | 2 |
2 files changed, 29 insertions, 3 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 7e262a6124c59..aed188f539a83 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -602,10 +602,9 @@ struct device_node *of_find_matching_node_by_address(struct device_node *from, return NULL; } - /** * of_iomap - Maps the memory mapped IO for a given device_node - * @device: the device whose io range will be mapped + * @device_node: Ptr to the device node that has the reg property * @index: index of the io range * * Returns a pointer to the mapped memory @@ -617,6 +616,31 @@ void __iomem *of_iomap(struct device_node *np, int index) if (of_address_to_resource(np, index, &res)) return NULL; - return ioremap(res.start, resource_size(&res)); + return (ioremap(res.start, resource_size(&res))); + } EXPORT_SYMBOL(of_iomap); + +/** + * of_devm_iomap - devres version of of_iomap + * @device: the device whose io range will be mapped + * @index: index of the io range + * + * Returns a pointer to the mapped memory + */ +void __iomem *of_devm_iomap(struct device *dev, int index) +{ + struct device_node *np; + struct resource res; + + if (!dev) + return NULL; + + np = dev->of_node; + if (of_address_to_resource(np, index, &res)) + return NULL; + + return devm_ioremap(dev, res.start, resource_size(&res)); +} +EXPORT_SYMBOL(of_devm_iomap); + diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 01b925ad8d78c..67efa5ffbbdd8 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -3,6 +3,7 @@ #include <linux/ioport.h> #include <linux/errno.h> #include <linux/of.h> +#include <linux/device.h> #ifdef CONFIG_OF_ADDRESS extern u64 of_translate_address(struct device_node *np, const __be32 *addr); @@ -13,6 +14,7 @@ extern struct device_node *of_find_matching_node_by_address( const struct of_device_id *matches, u64 base_address); extern void __iomem *of_iomap(struct device_node *device, int index); +extern void __iomem *of_devm_iomap(struct device *dev, int index); /* Extract an address from a device, returns the region size and * the address space flags too. The PCI version uses a BAR number |