diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-27 22:53:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-27 22:53:04 +0200 |
| commit | c88d6ab19ffab06f372b15c290bdf5d6f1ebfe9a (patch) | |
| tree | 020001798e0f799032c68942bc7d0b13a65041ca /arch/nios2/include/asm | |
| parent | fbb0030e3894119c089256f16626edd166c7629c (diff) | |
| parent | 8cbb0ddd7e696c6a4be1ae3ab3c95d3c8f6a7031 (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'arch/nios2/include/asm')
| -rw-r--r-- | arch/nios2/include/asm/byteorder.h | 6 | ||||
| -rw-r--r-- | arch/nios2/include/asm/dma-mapping.h | 23 |
2 files changed, 29 insertions, 0 deletions
diff --git a/arch/nios2/include/asm/byteorder.h b/arch/nios2/include/asm/byteorder.h index 495c823af2..d5c152e73e 100644 --- a/arch/nios2/include/asm/byteorder.h +++ b/arch/nios2/include/asm/byteorder.h @@ -25,6 +25,12 @@ #define __ASM_NIOS2_BYTEORDER_H_ #include <asm/types.h> + +#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) +# define __BYTEORDER_HAS_U64__ +# define __SWAB_64_THRU_32__ +#endif + #include <linux/byteorder/little_endian.h> #endif /* __ASM_NIOS2_BYTEORDER_H_ */ diff --git a/arch/nios2/include/asm/dma-mapping.h b/arch/nios2/include/asm/dma-mapping.h new file mode 100644 index 0000000000..1350e3b96f --- /dev/null +++ b/arch/nios2/include/asm/dma-mapping.h @@ -0,0 +1,23 @@ +#ifndef __ASM_NIOS2_DMA_MAPPING_H +#define __ASM_NIOS2_DMA_MAPPING_H + +/* dma_alloc_coherent() return cache-line aligned allocation which is mapped + * to uncached io region. + * + * IO_REGION_BASE should be defined in board config header file + * 0x80000000 for nommu, 0xe0000000 for mmu + */ + +static inline void *dma_alloc_coherent(size_t len, unsigned long *handle) +{ + void *addr = malloc(len + CONFIG_SYS_DCACHELINE_SIZE); + if (!addr) + return 0; + flush_dcache((unsigned long)addr, len + CONFIG_SYS_DCACHELINE_SIZE); + *handle = ((unsigned long)addr + + (CONFIG_SYS_DCACHELINE_SIZE - 1)) & + ~(CONFIG_SYS_DCACHELINE_SIZE - 1) & ~(IO_REGION_BASE); + return (void *)(*handle | IO_REGION_BASE); +} + +#endif /* __ASM_NIOS2_DMA_MAPPING_H */ |