diff options
Diffstat (limited to 'include/asm-arm/io.h')
-rw-r--r-- | include/asm-arm/io.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index ae69db4a1010..fd0147e52dbb 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
@@ -42,9 +42,9 @@ extern void __raw_writesb(void __iomem *addr, const void *data, int bytelen); | |||
42 | extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); | 42 | extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); |
43 | extern void __raw_writesl(void __iomem *addr, const void *data, int longlen); | 43 | extern void __raw_writesl(void __iomem *addr, const void *data, int longlen); |
44 | 44 | ||
45 | extern void __raw_readsb(void __iomem *addr, void *data, int bytelen); | 45 | extern void __raw_readsb(const void __iomem *addr, void *data, int bytelen); |
46 | extern void __raw_readsw(void __iomem *addr, void *data, int wordlen); | 46 | extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen); |
47 | extern void __raw_readsl(void __iomem *addr, void *data, int longlen); | 47 | extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); |
48 | 48 | ||
49 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v)) | 49 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v)) |
50 | #define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v)) | 50 | #define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v)) |
@@ -56,7 +56,12 @@ extern void __raw_readsl(void __iomem *addr, void *data, int longlen); | |||
56 | 56 | ||
57 | /* | 57 | /* |
58 | * Architecture ioremap implementation. | 58 | * Architecture ioremap implementation. |
59 | * | ||
60 | * __ioremap takes CPU physical address. | ||
61 | * | ||
62 | * __ioremap_pfn takes a Page Frame Number and an offset into that page | ||
59 | */ | 63 | */ |
64 | extern void __iomem * __ioremap_pfn(unsigned long, unsigned long, size_t, unsigned long); | ||
60 | extern void __iomem * __ioremap(unsigned long, size_t, unsigned long); | 65 | extern void __iomem * __ioremap(unsigned long, size_t, unsigned long); |
61 | extern void __iounmap(void __iomem *addr); | 66 | extern void __iounmap(void __iomem *addr); |
62 | 67 | ||
@@ -261,6 +266,7 @@ out: | |||
261 | * | 266 | * |
262 | * ioremap takes a PCI memory address, as specified in | 267 | * ioremap takes a PCI memory address, as specified in |
263 | * Documentation/IO-mapping.txt. | 268 | * Documentation/IO-mapping.txt. |
269 | * | ||
264 | */ | 270 | */ |
265 | #ifndef __arch_ioremap | 271 | #ifndef __arch_ioremap |
266 | #define ioremap(cookie,size) __ioremap(cookie,size,0) | 272 | #define ioremap(cookie,size) __ioremap(cookie,size,0) |