diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-20 07:27:31 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-20 07:27:31 -0500 |
| commit | 4246fae418f213d13ddd1829367183e94b5a7942 (patch) | |
| tree | 7bcaff8eccf086e9a87536ee74c7ebde817c71a8 /arch/x86 | |
| parent | 9770f92d022211dc02fb496a7642fde1a96a2292 (diff) | |
| parent | 4155ad9aac9474610038b525da9eec8ad9afbc12 (diff) | |
Merge tag 'mmc-2-20-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- sdhci: code clean-up and fix cache coherency problem
- enable cache snooping on mpc830x
- Fix build error when MMC_WRITE disabled
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/dma-mapping.h | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h index 900b99b8a6..8be1003e6b 100644 --- a/arch/x86/include/asm/dma-mapping.h +++ b/arch/x86/include/asm/dma-mapping.h @@ -11,10 +11,9 @@ #include <asm/cache.h> #include <cpu_func.h> #include <linux/dma-direction.h> +#include <linux/types.h> #include <malloc.h> -#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); @@ -26,30 +25,4 @@ 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) -{ - unsigned long addr = (unsigned long)vaddr; - - len = ALIGN(len, ARCH_DMA_MINALIGN); - - if (dir == DMA_FROM_DEVICE) - invalidate_dcache_range(addr, addr + len); - else - flush_dcache_range(addr, addr + len); - - return addr; -} - -static inline void dma_unmap_single(volatile void *vaddr, size_t len, - enum dma_data_direction dir) -{ - unsigned long addr = (unsigned long)vaddr; - - len = ALIGN(len, ARCH_DMA_MINALIGN); - - if (dir != DMA_TO_DEVICE) - invalidate_dcache_range(addr, addr + len); -} - #endif /* __ASM_X86_DMA_MAPPING_H */ |