Skip to content

Commit

Permalink
ARM: mach-orion5x: 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 18, 2011
1 parent bfcd2ea commit 6949f8c
Showing 1 changed file with 0 additions and 25 deletions.
25 changes: 0 additions & 25 deletions arch/arm/mach-orion5x/include/mach/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,6 @@

#define IO_SPACE_LIMIT 0xffffffff

static inline void __iomem *
__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)
{
void __iomem *retval;
unsigned long offs = paddr - ORION5X_REGS_PHYS_BASE;
if (mtype == MT_DEVICE && size && offs < ORION5X_REGS_SIZE &&
size <= ORION5X_REGS_SIZE && offs + size <= ORION5X_REGS_SIZE) {
retval = (void __iomem *)ORION5X_REGS_VIRT_BASE + offs;
} else {
retval = __arm_ioremap(paddr, size, mtype);
}

return retval;
}

static inline void
__arch_iounmap(void __iomem *addr)
{
if (addr < (void __iomem *)ORION5X_REGS_VIRT_BASE ||
addr >= (void __iomem *)(ORION5X_REGS_VIRT_BASE + ORION5X_REGS_SIZE))
__iounmap(addr);
}

#define __arch_ioremap __arch_ioremap
#define __arch_iounmap __arch_iounmap
#define __io(a) __typesafe_io(a)
#define __mem_pci(a) (a)

Expand Down

0 comments on commit 6949f8c

Please sign in to comment.