fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-arm / arch-l7200 / io.h

diff --git a/include/asm-arm/arch-l7200/io.h b/include/asm-arm/arch-l7200/io.h
index cab8ad0..645dbdf 100644 (file)
--- a/include/asm-arm/arch-l7200/io.h
+++ b/include/asm-arm/arch-l7200/io.h
@@ -17,60 +17,11 @@
 /*
  * There are not real ISA nor PCI buses, so we fake it.
  */
-#define __io_pci(a)            ((void __iomem *)(PCIO_BASE + (a)))
-#define __mem_pci(a)           (a)
-#define __mem_isa(a)           (a)
-
-#define __ioaddr(p)             __io_pci(p)
-
-/*
- * Generic virtual read/write
- */
-#define __arch_getb(a)          (*(volatile unsigned char *)(a))
-#define __arch_getl(a)          (*(volatile unsigned int  *)(a))
-
-static inline unsigned int __arch_getw(unsigned long a)
-{
-       unsigned int value;
-       __asm__ __volatile__("ldr%?h    %0, [%1, #0]    @ getw"
-               : "=&r" (value)
-               : "r" (a));
-       return value;
-}
-
-#define __arch_putb(v,a)        (*(volatile unsigned char *)(a) = (v))
-#define __arch_putl(v,a)        (*(volatile unsigned int  *)(a) = (v))
-
-static inline void __arch_putw(unsigned int value, unsigned long a)
+static inline void __iomem *__io(unsigned long addr)
 {
-        __asm__ __volatile__("str%?h    %0, [%1, #0]    @ putw"
-                : : "r" (value), "r" (a));
+       return (void __iomem *)addr;
 }
-
-/*
- * Translated address IO functions
- *
- * IO address has already been translated to a virtual address
- */
-#define outb_t(v,p)            (*(volatile unsigned char *)(p) = (v))
-#define inb_t(p)               (*(volatile unsigned char *)(p))
-#define outw_t(v,p)            (*(volatile unsigned int *)(p) = (v))
-#define inw_t(p)               (*(volatile unsigned int *)(p))
-#define outl_t(v,p)            (*(volatile unsigned long *)(p) = (v))
-#define inl_t(p)               (*(volatile unsigned long *)(p))
-
-/*
- * FIXME - These are to allow for linking. On all the other
- *         ARM platforms, the entire IO space is contiguous.
- *         The 7200 has three separate IO spaces. The below
- *         macros will eventually become more involved. Use
- *         with caution and don't be surprised by kernel oopses!!!
- */
-#define inb(p)                 inb_t(p)
-#define inw(p)                 inw_t(p)
-#define inl(p)                 inl_t(p)
-#define outb(v,p)              outb_t(v,p)
-#define outw(v,p)              outw_t(v,p)
-#define outl(v,p)              outl_t(v,p)
+#define __io(a)        __io(a)
+#define __mem_pci(a)           (a)
 
 #endif