Merge tag 'mmc-2-19-2020' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmcWIP/19Feb2020

- sdhci: code clean-up and fix cache coherency problem
- enable cache snooping on mpc830x
- Fix build error when MMC_WRITE disabled

1 files changed, 1 insertions, 28 deletions

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index d20703739f..8bb3fa2e0e 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/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, ROUND(len, ARCH_DMA_MINALIGN));
@@ -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_ARM_DMA_MAPPING_H */