diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-08 12:33:47 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-08 14:18:18 -0400 |
commit | 097d9eb537ff4d88b74c3fe67392e27c478ca3c5 (patch) | |
tree | 9034d676d9096857a380aab9d99e3e88fccb6bfe /include/asm-m68knommu/io.h | |
parent | c41107c2d4fd31924533f4dbc4c3428acc2b5894 (diff) | |
parent | aeee90dfa01844168cd7f8051d0a0f969c573067 (diff) |
Merge Linus' latest into master
Conflicts:
drivers/watchdog/at91rm9200_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/ixp2000_wdt.c
drivers/watchdog/ixp4xx_wdt.c
drivers/watchdog/ks8695_wdt.c
drivers/watchdog/omap_wdt.c
drivers/watchdog/pnx4008_wdt.c
drivers/watchdog/sa1100_wdt.c
drivers/watchdog/wdt285.c
Diffstat (limited to 'include/asm-m68knommu/io.h')
-rw-r--r-- | include/asm-m68knommu/io.h | 194 |
1 files changed, 0 insertions, 194 deletions
diff --git a/include/asm-m68knommu/io.h b/include/asm-m68knommu/io.h deleted file mode 100644 index 6adef1ee2082..000000000000 --- a/include/asm-m68knommu/io.h +++ /dev/null | |||
@@ -1,194 +0,0 @@ | |||
1 | #ifndef _M68KNOMMU_IO_H | ||
2 | #define _M68KNOMMU_IO_H | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | |||
6 | |||
7 | /* | ||
8 | * These are for ISA/PCI shared memory _only_ and should never be used | ||
9 | * on any other type of memory, including Zorro memory. They are meant to | ||
10 | * access the bus in the bus byte order which is little-endian!. | ||
11 | * | ||
12 | * readX/writeX() are used to access memory mapped devices. On some | ||
13 | * architectures the memory mapped IO stuff needs to be accessed | ||
14 | * differently. On the m68k architecture, we just read/write the | ||
15 | * memory location directly. | ||
16 | */ | ||
17 | /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates | ||
18 | * two accesses to memory, which may be undesireable for some devices. | ||
19 | */ | ||
20 | |||
21 | /* | ||
22 | * swap functions are sometimes needed to interface little-endian hardware | ||
23 | */ | ||
24 | static inline unsigned short _swapw(volatile unsigned short v) | ||
25 | { | ||
26 | return ((v << 8) | (v >> 8)); | ||
27 | } | ||
28 | |||
29 | static inline unsigned int _swapl(volatile unsigned long v) | ||
30 | { | ||
31 | return ((v << 24) | ((v & 0xff00) << 8) | ((v & 0xff0000) >> 8) | (v >> 24)); | ||
32 | } | ||
33 | |||
34 | #define readb(addr) \ | ||
35 | ({ unsigned char __v = (*(volatile unsigned char *) (addr)); __v; }) | ||
36 | #define readw(addr) \ | ||
37 | ({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; }) | ||
38 | #define readl(addr) \ | ||
39 | ({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; }) | ||
40 | |||
41 | #define readb_relaxed(addr) readb(addr) | ||
42 | #define readw_relaxed(addr) readw(addr) | ||
43 | #define readl_relaxed(addr) readl(addr) | ||
44 | |||
45 | #define writeb(b,addr) (void)((*(volatile unsigned char *) (addr)) = (b)) | ||
46 | #define writew(b,addr) (void)((*(volatile unsigned short *) (addr)) = (b)) | ||
47 | #define writel(b,addr) (void)((*(volatile unsigned int *) (addr)) = (b)) | ||
48 | |||
49 | #define __raw_readb readb | ||
50 | #define __raw_readw readw | ||
51 | #define __raw_readl readl | ||
52 | #define __raw_writeb writeb | ||
53 | #define __raw_writew writew | ||
54 | #define __raw_writel writel | ||
55 | |||
56 | static inline void io_outsb(unsigned int addr, void *buf, int len) | ||
57 | { | ||
58 | volatile unsigned char *ap = (volatile unsigned char *) addr; | ||
59 | unsigned char *bp = (unsigned char *) buf; | ||
60 | while (len--) | ||
61 | *ap = *bp++; | ||
62 | } | ||
63 | |||
64 | static inline void io_outsw(unsigned int addr, void *buf, int len) | ||
65 | { | ||
66 | volatile unsigned short *ap = (volatile unsigned short *) addr; | ||
67 | unsigned short *bp = (unsigned short *) buf; | ||
68 | while (len--) | ||
69 | *ap = _swapw(*bp++); | ||
70 | } | ||
71 | |||
72 | static inline void io_outsl(unsigned int addr, void *buf, int len) | ||
73 | { | ||
74 | volatile unsigned int *ap = (volatile unsigned int *) addr; | ||
75 | unsigned int *bp = (unsigned int *) buf; | ||
76 | while (len--) | ||
77 | *ap = _swapl(*bp++); | ||
78 | } | ||
79 | |||
80 | static inline void io_insb(unsigned int addr, void *buf, int len) | ||
81 | { | ||
82 | volatile unsigned char *ap = (volatile unsigned char *) addr; | ||
83 | unsigned char *bp = (unsigned char *) buf; | ||
84 | while (len--) | ||
85 | *bp++ = *ap; | ||
86 | } | ||
87 | |||
88 | static inline void io_insw(unsigned int addr, void *buf, int len) | ||
89 | { | ||
90 | volatile unsigned short *ap = (volatile unsigned short *) addr; | ||
91 | unsigned short *bp = (unsigned short *) buf; | ||
92 | while (len--) | ||
93 | *bp++ = _swapw(*ap); | ||
94 | } | ||
95 | |||
96 | static inline void io_insl(unsigned int addr, void *buf, int len) | ||
97 | { | ||
98 | volatile unsigned int *ap = (volatile unsigned int *) addr; | ||
99 | unsigned int *bp = (unsigned int *) buf; | ||
100 | while (len--) | ||
101 | *bp++ = _swapl(*ap); | ||
102 | } | ||
103 | |||
104 | #define mmiowb() | ||
105 | |||
106 | /* | ||
107 | * make the short names macros so specific devices | ||
108 | * can override them as required | ||
109 | */ | ||
110 | |||
111 | #define memset_io(a,b,c) memset((void *)(a),(b),(c)) | ||
112 | #define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c)) | ||
113 | #define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c)) | ||
114 | |||
115 | #define inb(addr) readb(addr) | ||
116 | #define inw(addr) readw(addr) | ||
117 | #define inl(addr) readl(addr) | ||
118 | #define outb(x,addr) ((void) writeb(x,addr)) | ||
119 | #define outw(x,addr) ((void) writew(x,addr)) | ||
120 | #define outl(x,addr) ((void) writel(x,addr)) | ||
121 | |||
122 | #define inb_p(addr) inb(addr) | ||
123 | #define inw_p(addr) inw(addr) | ||
124 | #define inl_p(addr) inl(addr) | ||
125 | #define outb_p(x,addr) outb(x,addr) | ||
126 | #define outw_p(x,addr) outw(x,addr) | ||
127 | #define outl_p(x,addr) outl(x,addr) | ||
128 | |||
129 | #define outsb(a,b,l) io_outsb(a,b,l) | ||
130 | #define outsw(a,b,l) io_outsw(a,b,l) | ||
131 | #define outsl(a,b,l) io_outsl(a,b,l) | ||
132 | |||
133 | #define insb(a,b,l) io_insb(a,b,l) | ||
134 | #define insw(a,b,l) io_insw(a,b,l) | ||
135 | #define insl(a,b,l) io_insl(a,b,l) | ||
136 | |||
137 | #define IO_SPACE_LIMIT 0xffff | ||
138 | |||
139 | |||
140 | /* Values for nocacheflag and cmode */ | ||
141 | #define IOMAP_FULL_CACHING 0 | ||
142 | #define IOMAP_NOCACHE_SER 1 | ||
143 | #define IOMAP_NOCACHE_NONSER 2 | ||
144 | #define IOMAP_WRITETHROUGH 3 | ||
145 | |||
146 | extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag); | ||
147 | extern void __iounmap(void *addr, unsigned long size); | ||
148 | |||
149 | static inline void *ioremap(unsigned long physaddr, unsigned long size) | ||
150 | { | ||
151 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | ||
152 | } | ||
153 | static inline void *ioremap_nocache(unsigned long physaddr, unsigned long size) | ||
154 | { | ||
155 | return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); | ||
156 | } | ||
157 | static inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size) | ||
158 | { | ||
159 | return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); | ||
160 | } | ||
161 | static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size) | ||
162 | { | ||
163 | return __ioremap(physaddr, size, IOMAP_FULL_CACHING); | ||
164 | } | ||
165 | |||
166 | extern void iounmap(void *addr); | ||
167 | |||
168 | /* Pages to physical address... */ | ||
169 | #define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT) | ||
170 | #define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT) | ||
171 | |||
172 | /* | ||
173 | * Macros used for converting between virtual and physical mappings. | ||
174 | */ | ||
175 | #define phys_to_virt(vaddr) ((void *) (vaddr)) | ||
176 | #define virt_to_phys(vaddr) ((unsigned long) (vaddr)) | ||
177 | |||
178 | #define virt_to_bus virt_to_phys | ||
179 | #define bus_to_virt phys_to_virt | ||
180 | |||
181 | /* | ||
182 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem | ||
183 | * access | ||
184 | */ | ||
185 | #define xlate_dev_mem_ptr(p) __va(p) | ||
186 | |||
187 | /* | ||
188 | * Convert a virtual cached pointer to an uncached pointer | ||
189 | */ | ||
190 | #define xlate_dev_kmem_ptr(p) p | ||
191 | |||
192 | #endif /* __KERNEL__ */ | ||
193 | |||
194 | #endif /* _M68KNOMMU_IO_H */ | ||