.. | .. |
---|
3 | 3 | #define _ASM_IO_H |
---|
4 | 4 | |
---|
5 | 5 | #include <linux/types.h> |
---|
6 | | -#include <asm/pgtable.h> |
---|
| 6 | +#include <linux/pgtable.h> |
---|
7 | 7 | |
---|
8 | 8 | #define virt_to_phys(a) ((unsigned long)__pa(a)) |
---|
9 | 9 | #define phys_to_virt(a) __va(a) |
---|
.. | .. |
---|
127 | 127 | /* |
---|
128 | 128 | * The standard PCI ioremap interfaces |
---|
129 | 129 | */ |
---|
130 | | - |
---|
131 | | -extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); |
---|
132 | | - |
---|
133 | | -/* Most machines react poorly to I/O-space being cacheable... Instead let's |
---|
134 | | - * define ioremap() in terms of ioremap_nocache(). |
---|
135 | | - */ |
---|
136 | | -static inline void __iomem * ioremap(unsigned long offset, unsigned long size) |
---|
137 | | -{ |
---|
138 | | - return __ioremap(offset, size, _PAGE_NO_CACHE); |
---|
139 | | -} |
---|
140 | | -#define ioremap_nocache(off, sz) ioremap((off), (sz)) |
---|
141 | | -#define ioremap_wc ioremap_nocache |
---|
142 | | -#define ioremap_uc ioremap_nocache |
---|
| 130 | +void __iomem *ioremap(unsigned long offset, unsigned long size); |
---|
| 131 | +#define ioremap_wc ioremap |
---|
| 132 | +#define ioremap_uc ioremap |
---|
143 | 133 | |
---|
144 | 134 | extern void iounmap(const volatile void __iomem *addr); |
---|
145 | 135 | |
---|
.. | .. |
---|
229 | 219 | #define writel_relaxed(l, addr) writel(l, addr) |
---|
230 | 220 | #define writeq_relaxed(q, addr) writeq(q, addr) |
---|
231 | 221 | |
---|
232 | | -#define mmiowb() do { } while (0) |
---|
233 | | - |
---|
234 | 222 | void memset_io(volatile void __iomem *addr, unsigned char val, int count); |
---|
235 | 223 | void memcpy_fromio(void *dst, const volatile void __iomem *src, int count); |
---|
236 | 224 | void memcpy_toio(volatile void __iomem *dst, const void *src, int count); |
---|
.. | .. |
---|
311 | 299 | * value for either 32 or 64 bit mode */ |
---|
312 | 300 | #define F_EXTEND(x) ((unsigned long)((x) | (0xffffffff00000000ULL))) |
---|
313 | 301 | |
---|
| 302 | +#define ioread64 ioread64 |
---|
| 303 | +#define ioread64be ioread64be |
---|
| 304 | +#define iowrite64 iowrite64 |
---|
| 305 | +#define iowrite64be iowrite64be |
---|
| 306 | +extern u64 ioread64(const void __iomem *addr); |
---|
| 307 | +extern u64 ioread64be(const void __iomem *addr); |
---|
| 308 | +extern void iowrite64(u64 val, void __iomem *addr); |
---|
| 309 | +extern void iowrite64be(u64 val, void __iomem *addr); |
---|
| 310 | + |
---|
314 | 311 | #include <asm-generic/iomap.h> |
---|
315 | 312 | |
---|
316 | 313 | /* |
---|