summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-09-16 16:27:56 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-09-25 13:34:57 +0200
commit3820307eb0523a3a44010c3184237153a996381d (patch)
treee6d4b2756d0b18ffa58d0cfd7be87a2de2000726 /include
parentd81251712c41107ef666be130ce583582bd975dd (diff)
downloadbarebox-3820307eb0523a3a44010c3184237153a996381d.tar.gz
barebox-3820307eb0523a3a44010c3184237153a996381d.tar.xz
rename dma macros
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/mmu.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/mmu.h b/include/asm-arm/mmu.h
index 5a04619f26..0dd3fa826c 100644
--- a/include/asm-arm/mmu.h
+++ b/include/asm-arm/mmu.h
@@ -22,8 +22,8 @@ void dma_free_coherent(void *mem);
void dma_clean_range(const void *, const void *);
void dma_flush_range(const void *, const void *);
void dma_inv_range(const void *, const void *);
-unsigned long dma_to_phys(void *virt);
-void *phys_to_dma(unsigned long phys);
+unsigned long virt_to_phys(void *virt);
+void *phys_to_virt(unsigned long phys);
#else
static inline void *dma_alloc_coherent(size_t size)
@@ -36,12 +36,12 @@ static inline void dma_free_coherent(void *mem)
free(mem);
}
-static inline void *phys_to_dma(unsigned long phys)
+static inline void *phys_to_virt(unsigned long phys)
{
return (void *)phys;
}
-static inline unsigned long dma_to_phys(void *mem)
+static inline unsigned long virt_to_phys(void *mem)
{
return (unsigned long)mem;
}