diff options
author | GuanXuetao <gxt@mprc.pku.edu.cn> | 2011-02-26 23:46:06 -0500 |
---|---|---|
committer | GuanXuetao <gxt@mprc.pku.edu.cn> | 2011-03-16 21:19:21 -0400 |
commit | 4fde87cb13a29c06e0b4c2cba86445492098fbc2 (patch) | |
tree | cbd99cd229d7258e846f91c3b7efe00897c5eab6 /arch/unicore32/include | |
parent | ce443ab5fd536941da1d529ba3963324f941fc29 (diff) |
unicore32: replace unicore32-specific iomap functions with generic lib implementation
1. define and enable CONFIG_GENERIC_IOMAP
2. define unicore32-specific PCI_IOBASE for asm-generic/io.h
3. define HAVE_ARCH_PIO_SIZE and unicore32-specific PIO_* macros
4. remove all unicore32-specific iomap functions
Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Reviewed-and-Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/unicore32/include')
-rw-r--r-- | arch/unicore32/include/asm/io.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h index d73457c1800a..2483fcbadbe4 100644 --- a/arch/unicore32/include/asm/io.h +++ b/arch/unicore32/include/asm/io.h | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/memory.h> | 18 | #include <asm/memory.h> |
19 | #include <asm/system.h> | 19 | #include <asm/system.h> |
20 | 20 | ||
21 | #define PCI_IOBASE io_p2v(PKUNITY_PCILIO_BASE) | ||
21 | #include <asm-generic/io.h> | 22 | #include <asm-generic/io.h> |
22 | 23 | ||
23 | /* | 24 | /* |
@@ -38,9 +39,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr); | |||
38 | #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) | 39 | #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) |
39 | #define iounmap(cookie) __uc32_iounmap(cookie) | 40 | #define iounmap(cookie) __uc32_iounmap(cookie) |
40 | 41 | ||
41 | extern void __iomem *ioport_map(unsigned long port, unsigned int nr); | ||
42 | extern void ioport_unmap(void __iomem *addr); | ||
43 | |||
44 | /* | 42 | /* |
45 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem | 43 | * Convert a physical pointer to a virtual kernel pointer for /dev/mem |
46 | * access | 44 | * access |
@@ -48,5 +46,10 @@ extern void ioport_unmap(void __iomem *addr); | |||
48 | #undef xlate_dev_mem_ptr | 46 | #undef xlate_dev_mem_ptr |
49 | #define xlate_dev_mem_ptr(p) __va(p) | 47 | #define xlate_dev_mem_ptr(p) __va(p) |
50 | 48 | ||
49 | #define HAVE_ARCH_PIO_SIZE | ||
50 | #define PIO_OFFSET (unsigned int)(PCI_IOBASE) | ||
51 | #define PIO_MASK (unsigned int)(IO_SPACE_LIMIT) | ||
52 | #define PIO_RESERVED (PIO_OFFSET + PIO_MASK + 1) | ||
53 | |||
51 | #endif /* __KERNEL__ */ | 54 | #endif /* __KERNEL__ */ |
52 | #endif /* __UNICORE_IO_H__ */ | 55 | #endif /* __UNICORE_IO_H__ */ |