Skip to content

Commit

Permalink
ARM: mach-tegra: 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>
Tested-by: Stephen Warren <swarren@nvidia.com>
  • Loading branch information
Nicolas Pitre authored and Nicolas Pitre committed Nov 16, 2011
1 parent 400eeee commit 3c4c342
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 27 deletions.
6 changes: 0 additions & 6 deletions arch/arm/mach-tegra/include/mach/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,6 @@

#ifndef __ASSEMBLER__

#define __arch_ioremap tegra_ioremap
#define __arch_iounmap tegra_iounmap

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

#define IO_ADDRESS(n) (IO_TO_VIRT(n))

#ifdef CONFIG_TEGRA_PCI
Expand Down
21 changes: 0 additions & 21 deletions arch/arm/mach-tegra/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,24 +60,3 @@ void __init tegra_map_common_io(void)
{
iotable_init(tegra_io_desc, ARRAY_SIZE(tegra_io_desc));
}

/*
* Intercept ioremap() requests for addresses in our fixed mapping regions.
*/
void __iomem *tegra_ioremap(unsigned long p, size_t size, unsigned int type)
{
void __iomem *v = IO_ADDRESS(p);
if (v == NULL)
v = __arm_ioremap(p, size, type);
return v;
}
EXPORT_SYMBOL(tegra_ioremap);

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

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

0 comments on commit 3c4c342

Please sign in to comment.