projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-video
[oweals/u-boot.git]
/
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 009863beec555f72410cd3c893855ac7f1c4f7b4..a5821f54e5670a185ea541013ec7e2359089db5b 100644
(file)
--- a/
arch/arm/include/asm/dma-mapping.h
+++ b/
arch/arm/include/asm/dma-mapping.h
@@
-8,18
+8,25
@@
#ifndef __ASM_ARM_DMA_MAPPING_H
#define __ASM_ARM_DMA_MAPPING_H
#ifndef __ASM_ARM_DMA_MAPPING_H
#define __ASM_ARM_DMA_MAPPING_H
+#define dma_mapping_error(x, y) 0
+
enum dma_data_direction {
DMA_BIDIRECTIONAL = 0,
DMA_TO_DEVICE = 1,
DMA_FROM_DEVICE = 2,
};
enum dma_data_direction {
DMA_BIDIRECTIONAL = 0,
DMA_TO_DEVICE = 1,
DMA_FROM_DEVICE = 2,
};
-static void *dma_alloc_coherent(size_t len, unsigned long *handle)
+static
inline
void *dma_alloc_coherent(size_t len, unsigned long *handle)
{
{
- *handle = (unsigned long)m
alloc(
len);
+ *handle = (unsigned long)m
emalign(ARCH_DMA_MINALIGN,
len);
return (void *)*handle;
}
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)
{
static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
enum dma_data_direction dir)
{