diff options
| author |   Rob Herring <rob.herring@calxeda.com> | 2012-02-13 13:27:24 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-06 21:23:17 -0600 |
| commit | b12e9ba59c83f7df846602b201b64e4ddf28ccee (patch) | |
| tree | 69c5b7eaada4db4a683d87d30ad4a033ec9047d1 /arch/arm/mach-msm/io.c | |
| parent | ARM: imx: convert to common runtime ioremap hook (diff) | |
| download | linux-dev-b12e9ba59c83f7df846602b201b64e4ddf28ccee.tar.xz linux-dev-b12e9ba59c83f7df846602b201b64e4ddf28ccee.zip | |
ARM: msm: use runtime ioremap hook
Convert msm platforms to use run-time ioremap hook instead of the compile
time hook.
According to David Brown, only the msm7201 needed the ioremap hook.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Tested-by: David Brown <davidb@codeaurora.org>
Acked-by: David Brown <davidb@codeaurora.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Bryan Huntsman <bryanh@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/io.c')
| -rw-r--r-- | arch/arm/mach-msm/io.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index 578b04e42deb..a1e7b1168850 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c @@ -172,8 +172,8 @@ void __init msm_map_msm7x30_io(void) } #endif /* CONFIG_ARCH_MSM7X30 */ -void __iomem * -__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) +void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, + unsigned int mtype, void *caller) { if (mtype == MT_DEVICE) { /* The peripherals in the 88000000 - D0000000 range @@ -184,7 +184,5 @@ __msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) mtype = MT_DEVICE_NONSHARED; } - return __arm_ioremap_caller(phys_addr, size, mtype, - __builtin_return_address(0)); + return __arm_ioremap_caller(phys_addr, size, mtype, caller); } -EXPORT_SYMBOL(__msm_ioremap); |