|
@@ -282,18 +282,7 @@ static inline void out_be32(volatile unsigned __iomem *addr, u32 val)
|
|
|
#define setbits_8(addr, set) setbits(8, addr, set)
|
|
|
#define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
|
|
|
|
|
|
-/*
|
|
|
- * Given a physical address and a length, return a virtual address
|
|
|
- * that can be used to access the memory range with the caching
|
|
|
- * properties specified by "flags".
|
|
|
- */
|
|
|
-#define MAP_NOCACHE (0)
|
|
|
-#define MAP_WRCOMBINE (0)
|
|
|
-#define MAP_WRBACK (0)
|
|
|
-#define MAP_WRTHROUGH (0)
|
|
|
-
|
|
|
-static inline void *
|
|
|
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
|
|
|
+static inline void *phys_to_virt(phys_addr_t paddr)
|
|
|
{
|
|
|
#ifdef CONFIG_ADDR_MAP
|
|
|
return addrmap_phys_to_virt(paddr);
|
|
@@ -301,14 +290,7 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
|
|
|
return (void *)((unsigned long)paddr);
|
|
|
#endif
|
|
|
}
|
|
|
-
|
|
|
-/*
|
|
|
- * Take down a mapping set up by map_physmem().
|
|
|
- */
|
|
|
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
|
|
|
-{
|
|
|
-
|
|
|
-}
|
|
|
+#define phys_to_virt phys_to_virt
|
|
|
|
|
|
static inline phys_addr_t virt_to_phys(void * vaddr)
|
|
|
{
|
|
@@ -318,5 +300,8 @@ static inline phys_addr_t virt_to_phys(void * vaddr)
|
|
|
return (phys_addr_t)((unsigned long)vaddr);
|
|
|
#endif
|
|
|
}
|
|
|
+#define virt_to_phys virt_to_phys
|
|
|
+
|
|
|
+#include <asm-generic/io.h>
|
|
|
|
|
|
#endif
|