aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/io.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-16 00:18:53 -0500
committerOlof Johansson <olof@lixom.net>2011-12-16 00:18:53 -0500
commitb46ad442a998beb8453fd6b9c5a67cd8a1cd1889 (patch)
treea5da6ea4aa5c6575fbeaddd3e24fbf9d20087019 /arch/arm/mach-tegra/io.c
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parenta890b6760d975cdbdfcdf5753dab4c91059af9b1 (diff)
Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/board
Diffstat (limited to 'arch/arm/mach-tegra/io.c')
-rw-r--r--arch/arm/mach-tegra/io.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mach-tegra/io.c b/arch/arm/mach-tegra/io.c
index 5489f8b5d6ad..d23ee2db2827 100644
--- a/arch/arm/mach-tegra/io.c
+++ b/arch/arm/mach-tegra/io.c
@@ -60,24 +60,3 @@ void __init tegra_map_common_io(void)
60{ 60{
61 iotable_init(tegra_io_desc, ARRAY_SIZE(tegra_io_desc)); 61 iotable_init(tegra_io_desc, ARRAY_SIZE(tegra_io_desc));
62} 62}
63
64/*
65 * Intercept ioremap() requests for addresses in our fixed mapping regions.
66 */
67void __iomem *tegra_ioremap(unsigned long p, size_t size, unsigned int type)
68{
69 void __iomem *v = IO_ADDRESS(p);
70 if (v == NULL)
71 v = __arm_ioremap(p, size, type);
72 return v;
73}
74EXPORT_SYMBOL(tegra_ioremap);
75
76void tegra_iounmap(volatile void __iomem *addr)
77{
78 unsigned long virt = (unsigned long)addr;
79
80 if (virt >= VMALLOC_START && virt < VMALLOC_END)
81 __iounmap(addr);
82}
83EXPORT_SYMBOL(tegra_iounmap);