From 4fde87cb13a29c06e0b4c2cba86445492098fbc2 Mon Sep 17 00:00:00 2001 From: GuanXuetao Date: Sun, 27 Feb 2011 12:46:06 +0800 Subject: 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 Reviewed-and-Acked-by: Arnd Bergmann --- arch/unicore32/include/asm/io.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'arch/unicore32/include') diff --git a/arch/unicore32/include/asm/io.h b/arch/unicore32/include/asm/io.h index d73457c1800..2483fcbadbe 100644 --- a/arch/unicore32/include/asm/io.h +++ b/arch/unicore32/include/asm/io.h @@ -18,6 +18,7 @@ #include #include +#define PCI_IOBASE io_p2v(PKUNITY_PCILIO_BASE) #include /* @@ -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__ */ -- cgit v1.2.3-70-g09d2