aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-09-16 22:05:05 -0400
committerRob Herring <rob.herring@calxeda.com>2013-10-09 21:04:10 -0400
commitd0dfa16a600190d142f7538e5909d13c35b60d98 (patch)
treeaad45142005812bb60b1e015873eac2218f0fccf
parent4acf4b9cd4534aaa9102004937e1ba79da01d008 (diff)
of: move of_translate_dma_address to of_address.h
of_translate_dma_address is implemented in common code, so move the declaration there too. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Grant Likely <grant.likely@linaro.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@lists.ozlabs.org
-rw-r--r--arch/powerpc/include/asm/prom.h4
-rw-r--r--include/linux/of_address.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 43fe0023d722..b8774bdc69e0 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -24,10 +24,6 @@
24 * OF address retreival & translation 24 * OF address retreival & translation
25 */ 25 */
26 26
27/* Translate a DMA address from device space to CPU space */
28extern u64 of_translate_dma_address(struct device_node *dev,
29 const __be32 *in_addr);
30
31/* Parse the ibm,dma-window property of an OF node into the busno, phys and 27/* Parse the ibm,dma-window property of an OF node into the busno, phys and
32 * size parameters. 28 * size parameters.
33 */ 29 */
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index e8a179773a1a..5f6ed6b182b8 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -34,6 +34,10 @@ static inline void of_pci_range_to_resource(struct of_pci_range *range,
34 res->name = np->full_name; 34 res->name = np->full_name;
35} 35}
36 36
37/* Translate a DMA address from device space to CPU space */
38extern u64 of_translate_dma_address(struct device_node *dev,
39 const __be32 *in_addr);
40
37#ifdef CONFIG_OF_ADDRESS 41#ifdef CONFIG_OF_ADDRESS
38extern u64 of_translate_address(struct device_node *np, const __be32 *addr); 42extern u64 of_translate_address(struct device_node *np, const __be32 *addr);
39extern bool of_can_translate_address(struct device_node *dev); 43extern bool of_can_translate_address(struct device_node *dev);