Skip to content

Commit

Permalink
ARM: mach-at91: remove arch specific special handling for ioremap
Browse files Browse the repository at this point in the history
A generic version should replace this later.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
  • Loading branch information
Nicolas Pitre authored and Nicolas Pitre committed Nov 16, 2011
1 parent df9528a commit cf48c02
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 26 deletions.
8 changes: 0 additions & 8 deletions arch/arm/mach-at91/include/mach/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@

#ifndef __ASSEMBLY__

#ifndef CONFIG_ARCH_AT91X40
#define __arch_ioremap at91_ioremap
#define __arch_iounmap at91_iounmap
#endif

void __iomem *at91_ioremap(unsigned long phys, size_t size, unsigned int type);
void at91_iounmap(volatile void __iomem *addr);

static inline unsigned int at91_sys_read(unsigned int reg_offset)
{
void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
Expand Down
18 changes: 0 additions & 18 deletions arch/arm/mach-at91/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,24 +73,6 @@ static struct map_desc at91_io_desc __initdata = {
.type = MT_DEVICE,
};

void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
{
if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
return (void __iomem *)AT91_IO_P2V(p);

return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
}
EXPORT_SYMBOL(at91_ioremap);

void at91_iounmap(volatile void __iomem *addr)
{
unsigned long virt = (unsigned long)addr;

if (virt >= VMALLOC_START && virt < VMALLOC_END)
__iounmap(addr);
}
EXPORT_SYMBOL(at91_iounmap);

#define AT91_DBGU0 0xfffff200
#define AT91_DBGU1 0xffffee00

Expand Down

0 comments on commit cf48c02

Please sign in to comment.