diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 07:48:09 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 16:14:26 -0600 |
| commit | 1f5bef30cf6c66f097ea5dfc580a41924df888d1 (patch) | |
| tree | 345d9db4b6b20de814599cb7129005abd945ceea /include/linux | |
| parent | 6b884a8d50a6eea2fb3dad7befe748f67193073b (diff) | |
of/address: merge of_address_to_resource()
Merge common code between PowerPC and Microblaze. This patch also
moves the prototype of pci_address_to_pio() out of pci-bridge.h and
into prom.h because the only user of pci_address_to_pio() is
of_address_to_resource().
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: Michal Simek <monstr@monstr.eu>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/of_address.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 570831d7e79..474b794ed9d 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -3,6 +3,11 @@ #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 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); #endif /* __OF_ADDRESS_H */ |