From ef21d6a101f07d0b42ecf04f508ab96840d70616 Mon Sep 17 00:00:00 2001 From: Siva Durga Prasad Paladugu Date: Wed, 13 Apr 2016 17:27:24 +0530 Subject: [PATCH] Revert "Data types defined for 64 bit physical address" This reverts commit f4f0b7403a06d2642ca40e6a0b18ee7336f276a8. Reverting this commit as it is causing usb failures Need to find the exact root cause yet and hence this workaround for the usb to work Signed-off-by: Siva Durga Prasad Paladugu Signed-off-by: Michal Simek --- arch/arm/include/asm/io.h | 4 ++-- arch/arm/include/asm/types.h | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 75773bdbe07..bfbe0a0988b 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -46,7 +46,7 @@ static inline void sync(void) static inline void * map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) { - return (void *)((unsigned long)paddr); + return (void *)paddr; } /* @@ -59,7 +59,7 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags) static inline phys_addr_t virt_to_phys(void * vaddr) { - return (phys_addr_t)((unsigned long)vaddr); + return (phys_addr_t)(vaddr); } /* diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h index 388058e04c5..ee77c4179f1 100644 --- a/arch/arm/include/asm/types.h +++ b/arch/arm/include/asm/types.h @@ -45,16 +45,12 @@ typedef unsigned long long u64; #define BITS_PER_LONG 32 #endif /* CONFIG_ARM64 */ -#ifdef CONFIG_PHYS_64BIT -typedef unsigned long long dma_addr_t; -typedef unsigned long long phys_addr_t; -typedef unsigned long long phys_size_t; -#else -/* DMA addresses are 32-bits wide */ +/* Dma addresses are 32-bits wide. */ + typedef u32 dma_addr_t; + typedef unsigned long phys_addr_t; typedef unsigned long phys_size_t; -#endif #endif /* __KERNEL__ */ -- 2.47.3