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 <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 75773bdbe079701026986037f3bc019c5fc45b12..bfbe0a0988b47b2eafc636ca238f35087d7a5e5f 100644 (file)
--- 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 388058e04c5b88a3aa62a22dc54dc3634a4cc65f..ee77c4179f1aa04c24d37944b870c69ddebb13c3 100644 (file)
--- 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__ */