diff options
| author | GuanXuetao <gxt@mprc.pku.edu.cn> | 2011-02-27 12:46:06 +0800 |
|---|---|---|
| committer | GuanXuetao <gxt@mprc.pku.edu.cn> | 2011-03-17 09:19:21 +0800 |
| commit | 4fde87cb13a29c06e0b4c2cba86445492098fbc2 (patch) | |
| tree | cbd99cd229d7258e846f91c3b7efe00897c5eab6 /arch/unicore32/include | |
| parent | ce443ab5fd536941da1d529ba3963324f941fc29 (diff) | |
| download | blackbird-op-linux-4fde87cb13a29c06e0b4c2cba86445492098fbc2.tar.gz blackbird-op-linux-4fde87cb13a29c06e0b4c2cba86445492098fbc2.zip | |
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 @@ #include <asm/memory.h> #include <asm/system.h> +#define PCI_IOBASE io_p2v(PKUNITY_PCILIO_BASE) #include <asm-generic/io.h> /* @@ -38,9 +39,6 @@ extern void __uc32_iounmap(volatile void __iomem *addr); #define ioremap_cached(cookie, size) __uc32_ioremap_cached(cookie, size) #define iounmap(cookie) __uc32_iounmap(cookie) -extern void __iomem *ioport_map(unsigned long port, unsigned int nr); -extern void ioport_unmap(void __iomem *addr); - /* * Convert a physical pointer to a virtual kernel pointer for /dev/mem * access @@ -48,5 +46,10 @@ extern void ioport_unmap(void __iomem *addr); #undef xlate_dev_mem_ptr #define xlate_dev_mem_ptr(p) __va(p) +#define HAVE_ARCH_PIO_SIZE +#define PIO_OFFSET (unsigned int)(PCI_IOBASE) +#define PIO_MASK (unsigned int)(IO_SPACE_LIMIT) +#define PIO_RESERVED (PIO_OFFSET + PIO_MASK + 1) + #endif /* __KERNEL__ */ #endif /* __UNICORE_IO_H__ */ |
