aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-06-08 09:48:10 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-07-05 18:14:26 -0400
commitdbbdee94734bf6f1db7af42008a53655e77cab8f (patch)
treec0f571b0ab57a6483bc07e21e3b888e253d699ea /arch/powerpc/include
parent1f5bef30cf6c66f097ea5dfc580a41924df888d1 (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/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/prom.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index ceace966c51..f864722679e 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -45,10 +45,6 @@ extern void pci_create_OF_bus_map(void);
45 * OF address retreival & translation 45 * OF address retreival & translation
46 */ 46 */
47 47
48/* Translate an OF address block into a CPU physical address
49 */
50extern u64 of_translate_address(struct device_node *np, const u32 *addr);
51
52/* Translate a DMA address from device space to CPU space */ 48/* Translate a DMA address from device space to CPU space */
53extern u64 of_translate_dma_address(struct device_node *dev, 49extern u64 of_translate_dma_address(struct device_node *dev,
54 const u32 *in_addr); 50 const u32 *in_addr);