diff options
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/io.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 0f737fcebcc1..6a722860e34d 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h | |||
@@ -234,6 +234,7 @@ static inline void __indirect_readsl(const volatile void __iomem *bus_addr, | |||
234 | * I/O functions. | 234 | * I/O functions. |
235 | */ | 235 | */ |
236 | 236 | ||
237 | #define outb outb | ||
237 | static inline void outb(u8 value, u32 addr) | 238 | static inline void outb(u8 value, u32 addr) |
238 | { | 239 | { |
239 | u32 n, byte_enables, data; | 240 | u32 n, byte_enables, data; |
@@ -243,12 +244,14 @@ static inline void outb(u8 value, u32 addr) | |||
243 | ixp4xx_pci_write(addr, byte_enables | NP_CMD_IOWRITE, data); | 244 | ixp4xx_pci_write(addr, byte_enables | NP_CMD_IOWRITE, data); |
244 | } | 245 | } |
245 | 246 | ||
247 | #define outsb outsb | ||
246 | static inline void outsb(u32 io_addr, const u8 *vaddr, u32 count) | 248 | static inline void outsb(u32 io_addr, const u8 *vaddr, u32 count) |
247 | { | 249 | { |
248 | while (count--) | 250 | while (count--) |
249 | outb(*vaddr++, io_addr); | 251 | outb(*vaddr++, io_addr); |
250 | } | 252 | } |
251 | 253 | ||
254 | #define outw outw | ||
252 | static inline void outw(u16 value, u32 addr) | 255 | static inline void outw(u16 value, u32 addr) |
253 | { | 256 | { |
254 | u32 n, byte_enables, data; | 257 | u32 n, byte_enables, data; |
@@ -258,23 +261,27 @@ static inline void outw(u16 value, u32 addr) | |||
258 | ixp4xx_pci_write(addr, byte_enables | NP_CMD_IOWRITE, data); | 261 | ixp4xx_pci_write(addr, byte_enables | NP_CMD_IOWRITE, data); |
259 | } | 262 | } |
260 | 263 | ||
264 | #define outsw outsw | ||
261 | static inline void outsw(u32 io_addr, const u16 *vaddr, u32 count) | 265 | static inline void outsw(u32 io_addr, const u16 *vaddr, u32 count) |
262 | { | 266 | { |
263 | while (count--) | 267 | while (count--) |
264 | outw(cpu_to_le16(*vaddr++), io_addr); | 268 | outw(cpu_to_le16(*vaddr++), io_addr); |
265 | } | 269 | } |
266 | 270 | ||
271 | #define outl outl | ||
267 | static inline void outl(u32 value, u32 addr) | 272 | static inline void outl(u32 value, u32 addr) |
268 | { | 273 | { |
269 | ixp4xx_pci_write(addr, NP_CMD_IOWRITE, value); | 274 | ixp4xx_pci_write(addr, NP_CMD_IOWRITE, value); |
270 | } | 275 | } |
271 | 276 | ||
277 | #define outsl outsl | ||
272 | static inline void outsl(u32 io_addr, const u32 *vaddr, u32 count) | 278 | static inline void outsl(u32 io_addr, const u32 *vaddr, u32 count) |
273 | { | 279 | { |
274 | while (count--) | 280 | while (count--) |
275 | outl(cpu_to_le32(*vaddr++), io_addr); | 281 | outl(cpu_to_le32(*vaddr++), io_addr); |
276 | } | 282 | } |
277 | 283 | ||
284 | #define inb inb | ||
278 | static inline u8 inb(u32 addr) | 285 | static inline u8 inb(u32 addr) |
279 | { | 286 | { |
280 | u32 n, byte_enables, data; | 287 | u32 n, byte_enables, data; |
@@ -286,12 +293,14 @@ static inline u8 inb(u32 addr) | |||
286 | return data >> (8*n); | 293 | return data >> (8*n); |
287 | } | 294 | } |
288 | 295 | ||
296 | #define insb insb | ||
289 | static inline void insb(u32 io_addr, u8 *vaddr, u32 count) | 297 | static inline void insb(u32 io_addr, u8 *vaddr, u32 count) |
290 | { | 298 | { |
291 | while (count--) | 299 | while (count--) |
292 | *vaddr++ = inb(io_addr); | 300 | *vaddr++ = inb(io_addr); |
293 | } | 301 | } |
294 | 302 | ||
303 | #define inw inw | ||
295 | static inline u16 inw(u32 addr) | 304 | static inline u16 inw(u32 addr) |
296 | { | 305 | { |
297 | u32 n, byte_enables, data; | 306 | u32 n, byte_enables, data; |
@@ -303,12 +312,14 @@ static inline u16 inw(u32 addr) | |||
303 | return data>>(8*n); | 312 | return data>>(8*n); |
304 | } | 313 | } |
305 | 314 | ||
315 | #define insw insw | ||
306 | static inline void insw(u32 io_addr, u16 *vaddr, u32 count) | 316 | static inline void insw(u32 io_addr, u16 *vaddr, u32 count) |
307 | { | 317 | { |
308 | while (count--) | 318 | while (count--) |
309 | *vaddr++ = le16_to_cpu(inw(io_addr)); | 319 | *vaddr++ = le16_to_cpu(inw(io_addr)); |
310 | } | 320 | } |
311 | 321 | ||
322 | #define inl inl | ||
312 | static inline u32 inl(u32 addr) | 323 | static inline u32 inl(u32 addr) |
313 | { | 324 | { |
314 | u32 data; | 325 | u32 data; |
@@ -318,6 +329,7 @@ static inline u32 inl(u32 addr) | |||
318 | return data; | 329 | return data; |
319 | } | 330 | } |
320 | 331 | ||
332 | #define insl insl | ||
321 | static inline void insl(u32 io_addr, u32 *vaddr, u32 count) | 333 | static inline void insl(u32 io_addr, u32 *vaddr, u32 count) |
322 | { | 334 | { |
323 | while (count--) | 335 | while (count--) |