diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:22 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:22 +0200 |
commit | dd3c898d06a55a4c6fe94dae3f732a541e983432 (patch) | |
tree | 9f8ea0b057a6a1b52c948214d27ccde9378326a9 /arch/nios2/include/asm/dma-mapping.h | |
parent | 649f558483f9959c0ac4123da8c7b647d9808be5 (diff) | |
parent | 40faf584cd60c1e0e083ac75eb9ef5f9e7c071d0 (diff) | |
download | barebox-dd3c898d06a55a4c6fe94dae3f732a541e983432.tar.gz barebox-dd3c898d06a55a4c6fe94dae3f732a541e983432.tar.xz |
Merge branch 'for-next/dma-cache-align'
Diffstat (limited to 'arch/nios2/include/asm/dma-mapping.h')
-rw-r--r-- | arch/nios2/include/asm/dma-mapping.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h index 5b70f4cead..9819a973e7 100644 --- a/arch/nios2/include/asm/dma-mapping.h +++ b/arch/nios2/include/asm/dma-mapping.h @@ -1,8 +1,12 @@ #ifndef __ASM_NIOS2_DMA_MAPPING_H #define __ASM_NIOS2_DMA_MAPPING_H +#include <common.h> +#include <xfuncs.h> + #include <asm/cache.h> + /* dma_alloc_coherent() return cache-line aligned allocation which is mapped * to uncached io region. * @@ -22,4 +26,10 @@ static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) return (void *)(*handle | IO_REGION_BASE); } +#define dma_alloc dma_alloc +static inline void *dma_alloc(size_t size) +{ + return xmemalign(DCACHE_LINE_SIZE, ALIGN(size, DCACHE_LINE_SIZE)); +} + #endif /* __ASM_NIOS2_DMA_MAPPING_H */ |