diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 07:48:10 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 16:14:26 -0600 |
| commit | dbbdee94734bf6f1db7af42008a53655e77cab8f (patch) | |
| tree | c0f571b0ab57a6483bc07e21e3b888e253d699ea /include | |
| parent | 1f5bef30cf6c66f097ea5dfc580a41924df888d1 (diff) | |
of/address: Merge all of the bus translation code
Microblaze and PowerPC share a large chunk of code for translating
OF device tree data into usable addresses. Differences between the two
consist of cosmetic differences, and the addition of dma-ranges support
code to powerpc but not microblaze. This patch moves the powerpc
version into common code and applies many of the cosmetic (non-functional)
changes from the microblaze version.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Michal Simek <monstr@monstr.eu>
CC: Wolfram Sang <w.sang@pengutronix.de>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/of_address.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 474b794ed9d..cc567df9a00 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -3,9 +3,7 @@ #include <linux/ioport.h> #include <linux/of.h> -extern int __of_address_to_resource(struct device_node *dev, const u32 *addrp, - u64 size, unsigned int flags, - struct resource *r); +extern u64 of_translate_address(struct device_node *np, const u32 *addr); extern int of_address_to_resource(struct device_node *dev, int index, struct resource *r); extern void __iomem *of_iomap(struct device_node *device, int index); |