diff options
| -rw-r--r-- | arch/arm/mach-at91/include/mach/io.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-at91/setup.c | 18 |
2 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/mach-at91/include/mach/io.h b/arch/arm/mach-at91/include/mach/io.h index 4298e7806c76..4ca09ef7ca29 100644 --- a/arch/arm/mach-at91/include/mach/io.h +++ b/arch/arm/mach-at91/include/mach/io.h | |||
| @@ -30,14 +30,6 @@ | |||
| 30 | 30 | ||
| 31 | #ifndef __ASSEMBLY__ | 31 | #ifndef __ASSEMBLY__ |
| 32 | 32 | ||
| 33 | #ifndef CONFIG_ARCH_AT91X40 | ||
| 34 | #define __arch_ioremap at91_ioremap | ||
| 35 | #define __arch_iounmap at91_iounmap | ||
| 36 | #endif | ||
| 37 | |||
| 38 | void __iomem *at91_ioremap(unsigned long phys, size_t size, unsigned int type); | ||
| 39 | void at91_iounmap(volatile void __iomem *addr); | ||
| 40 | |||
| 41 | static inline unsigned int at91_sys_read(unsigned int reg_offset) | 33 | static inline unsigned int at91_sys_read(unsigned int reg_offset) |
| 42 | { | 34 | { |
| 43 | void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; | 35 | void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; |
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index aa64294c7db3..cf98a8f94dc5 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c | |||
| @@ -73,24 +73,6 @@ static struct map_desc at91_io_desc __initdata = { | |||
| 73 | .type = MT_DEVICE, | 73 | .type = MT_DEVICE, |
| 74 | }; | 74 | }; |
| 75 | 75 | ||
| 76 | void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type) | ||
| 77 | { | ||
| 78 | if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1)) | ||
| 79 | return (void __iomem *)AT91_IO_P2V(p); | ||
| 80 | |||
| 81 | return __arm_ioremap_caller(p, size, type, __builtin_return_address(0)); | ||
| 82 | } | ||
| 83 | EXPORT_SYMBOL(at91_ioremap); | ||
| 84 | |||
| 85 | void at91_iounmap(volatile void __iomem *addr) | ||
| 86 | { | ||
| 87 | unsigned long virt = (unsigned long)addr; | ||
| 88 | |||
| 89 | if (virt >= VMALLOC_START && virt < VMALLOC_END) | ||
| 90 | __iounmap(addr); | ||
| 91 | } | ||
| 92 | EXPORT_SYMBOL(at91_iounmap); | ||
| 93 | |||
| 94 | #define AT91_DBGU0 0xfffff200 | 76 | #define AT91_DBGU0 0xfffff200 |
| 95 | #define AT91_DBGU1 0xffffee00 | 77 | #define AT91_DBGU1 0xffffee00 |
| 96 | 78 | ||
