trab: fix warning: implicit declaration of function 'disable_vfd'

[u-boot] / include / asm-avr32 / io.h

diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h
index d22cd3561127c1fb60e65991cc1ba0f072f51c44..1cb17ead3f184e2414788194020c27b7c34d8af2 100644 (file)
--- a/include/asm-avr32/io.h
+++ b/include/asm-avr32/io.h
@@ -73,21 +73,8 @@ extern void __readwrite_bug(const char *fn);
 #define inw(p) ({ unsigned int __v = __le16_to_cpu(__raw_readw(p)); __v; })
 #define inl(p) ({ unsigned int __v = __le32_to_cpu(__raw_readl(p)); __v; })
 
-#include <asm/addrspace.h>
-
-/* virt_to_phys will only work when address is in P1 or P2 */
-static __inline__ unsigned long virt_to_phys(volatile void *address)
-{
-       return PHYSADDR(address);
-}
-
-static __inline__ void * phys_to_virt(unsigned long address)
-{
-       return (void *)P1SEGADDR(address);
-}
-
-#define cached(addr) ((void *)P1SEGADDR(addr))
-#define uncached(addr) ((void *)P2SEGADDR(addr))
+#include <asm/arch/addrspace.h>
+/* Provides virt_to_phys, phys_to_virt, cached, uncached, map_physmem */
 
 #endif /* __KERNEL__ */
 
@@ -95,28 +82,6 @@ static inline void sync(void)
 {
 }
 
-/*
- * 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".
- *
- * This implementation works for memory below 512MiB (flash, etc.) as
- * well as above 3.5GiB (internal peripherals.)
- */
-#define MAP_NOCACHE    (0)
-#define MAP_WRCOMBINE  (1 << 7)
-#define MAP_WRBACK     (MAP_WRCOMBINE | (1 << 9))
-#define MAP_WRTHROUGH  (MAP_WRBACK | (1 << 0))
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
-       if (flags == MAP_WRBACK)
-               return (void *)P1SEGADDR(paddr);
-       else
-               return (void *)P2SEGADDR(paddr);
-}
-
 /*
  * Take down a mapping set up by map_physmem().
  */
@@ -125,9 +90,4 @@ static inline void unmap_physmem(void *vaddr, unsigned long len)
 
 }
 
-static inline phys_addr_t virt_to_phys(void * vaddr)
-{
-       return (phys_addr_t)(vaddr);
-}
-
 #endif /* __ASM_AVR32_IO_H */