aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-l7200/io.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-11-30 09:39:14 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-11-30 09:39:14 -0500
commit9b531ce242159bd26e09b55d8fb4be3f4bf75e24 (patch)
tree079d92d582fc2df4604ce62c9eb21e1721523d4a /include/asm-arm/arch-l7200/io.h
parent6f4c7e39cb769addf047de8ec395a200cc6eec94 (diff)
[ARM] Remove "translated" io macros
The "translated" io macros were never really used. Remove them. Preserve the L7200 inb() and friends by defining the __io() macro, so that the generic versions can be used instead. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-l7200/io.h')
-rw-r--r--include/asm-arm/arch-l7200/io.h31
1 files changed, 5 insertions, 26 deletions
diff --git a/include/asm-arm/arch-l7200/io.h b/include/asm-arm/arch-l7200/io.h
index fb9c6e1b48e0..645dbdfb3908 100644
--- a/include/asm-arm/arch-l7200/io.h
+++ b/include/asm-arm/arch-l7200/io.h
@@ -17,32 +17,11 @@
17/* 17/*
18 * There are not real ISA nor PCI buses, so we fake it. 18 * There are not real ISA nor PCI buses, so we fake it.
19 */ 19 */
20static inline void __iomem *__io(unsigned long addr)
21{
22 return (void __iomem *)addr;
23}
24#define __io(a) __io(a)
20#define __mem_pci(a) (a) 25#define __mem_pci(a) (a)
21 26
22/*
23 * Translated address IO functions
24 *
25 * IO address has already been translated to a virtual address
26 */
27#define outb_t(v,p) (*(volatile unsigned char *)(p) = (v))
28#define inb_t(p) (*(volatile unsigned char *)(p))
29#define outw_t(v,p) (*(volatile unsigned int *)(p) = (v))
30#define inw_t(p) (*(volatile unsigned int *)(p))
31#define outl_t(v,p) (*(volatile unsigned long *)(p) = (v))
32#define inl_t(p) (*(volatile unsigned long *)(p))
33
34/*
35 * FIXME - These are to allow for linking. On all the other
36 * ARM platforms, the entire IO space is contiguous.
37 * The 7200 has three separate IO spaces. The below
38 * macros will eventually become more involved. Use
39 * with caution and don't be surprised by kernel oopses!!!
40 */
41#define inb(p) inb_t(p)
42#define inw(p) inw_t(p)
43#define inl(p) inl_t(p)
44#define outb(v,p) outb_t(v,p)
45#define outw(v,p) outw_t(v,p)
46#define outl(v,p) outl_t(v,p)
47
48#endif 27#endif