diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 09:48:10 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-05 18:14:26 -0400 |
commit | dbbdee94734bf6f1db7af42008a53655e77cab8f (patch) | |
tree | c0f571b0ab57a6483bc07e21e3b888e253d699ea /arch/microblaze/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 'arch/microblaze/include')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 4e94c0706c50..cb9c3dd9a23b 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -52,10 +52,6 @@ extern void pci_create_OF_bus_map(void); | |||
52 | * OF address retreival & translation | 52 | * OF address retreival & translation |
53 | */ | 53 | */ |
54 | 54 | ||
55 | /* Translate an OF address block into a CPU physical address | ||
56 | */ | ||
57 | extern u64 of_translate_address(struct device_node *np, const u32 *addr); | ||
58 | |||
59 | /* Extract an address from a device, returns the region size and | 55 | /* Extract an address from a device, returns the region size and |
60 | * the address space flags too. The PCI version uses a BAR number | 56 | * the address space flags too. The PCI version uses a BAR number |
61 | * instead of an absolute index | 57 | * instead of an absolute index |