am33xx: Update DT files, add am335x_gp_evm_config target

[karo-tx-uboot.git] / lib / addr_map.c

diff --git a/lib/addr_map.c b/lib/addr_map.c
index ff8532cf1528f037dbab39952c78cc6b8424db58..31384d13984323f0bf624beaa9b2751a17e6ef8b 100644 (file)
--- a/lib/addr_map.c
+++ b/lib/addr_map.c
@@ -47,26 +47,29 @@ phys_addr_t addrmap_virt_to_phys(void * vaddr)
        return (phys_addr_t)(~0);
 }
 
-unsigned long addrmap_phys_to_virt(phys_addr_t paddr)
+void *addrmap_phys_to_virt(phys_addr_t paddr)
 {
        int i;
 
        for (i = 0; i < CONFIG_SYS_NUM_ADDR_MAP; i++) {
-               u64 base, upper, addr;
+               phys_addr_t base, upper;
 
                if (address_map[i].size == 0)
                        continue;
 
-               addr = (u64)paddr;
-               base = (u64)(address_map[i].paddr);
-               upper = (u64)(address_map[i].size) + base - 1;
+               base = address_map[i].paddr;
+               upper = address_map[i].size + base - 1;
 
-               if (addr >= base && addr <= upper) {
-                       return paddr - address_map[i].paddr + address_map[i].vaddr;
+               if (paddr >= base && paddr <= upper) {
+                       phys_addr_t offset;
+
+                       offset = address_map[i].paddr - address_map[i].vaddr;
+
+                       return (void *)(unsigned long)(paddr - offset);
                }
        }
 
-       return (unsigned long)(~0);
+       return (void *)(~0);
 }
 
 void addrmap_set_entry(unsigned long vaddr, phys_addr_t paddr,