Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / arch / arm / include / asm / dma-mapping.h

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index 55a4e266a0a7078dc8f5390647b51019b8c78962..287466800e4bfd4f1793e8a59d22ef65c86fbd8b 100644 (file)
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -8,18 +8,21 @@
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
-enum dma_data_direction {
-       DMA_BIDIRECTIONAL       = 0,
-       DMA_TO_DEVICE           = 1,
-       DMA_FROM_DEVICE         = 2,
-};
+#include <linux/dma-direction.h>
 
-static void *dma_alloc_coherent(size_t len, unsigned long *handle)
+#define        dma_mapping_error(x, y) 0
+
+static inline void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
        *handle = (unsigned long)memalign(ARCH_DMA_MINALIGN, len);
        return (void *)*handle;
 }
 
+static inline void dma_free_coherent(void *addr)
+{
+       free(addr);
+}
+
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
                                           enum dma_data_direction dir)
 {