diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-02-13 23:27:24 +0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-03-07 07:23:17 +0400 |
| commit | b12e9ba59c83f7df846602b201b64e4ddf28ccee (patch) | |
| tree | 69c5b7eaada4db4a683d87d30ad4a033ec9047d1 /arch/arm/mach-msm/include | |
| parent | c177aa98e5a7bbf71bc28baf0516896e3bb13f6e (diff) | |
| download | linux-b12e9ba59c83f7df846602b201b64e4ddf28ccee.tar.xz | |
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/include')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/io.h | 5 | ||||
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-msm/include/mach/io.h b/arch/arm/mach-msm/include/mach/io.h index dc1b928745e9..c6ff9bb8db31 100644 --- a/arch/arm/mach-msm/include/mach/io.h +++ b/arch/arm/mach-msm/include/mach/io.h @@ -18,11 +18,6 @@ #define IO_SPACE_LIMIT 0xffffffff -#define __arch_ioremap __msm_ioremap -#define __arch_iounmap __iounmap - -void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype); - #define __io(a) __typesafe_io(a) #define __mem_pci(a) (a) diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h index 8af46123dab6..152b3b70afab 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h @@ -111,5 +111,11 @@ #define MSM_AD5_PHYS 0xAC000000 #define MSM_AD5_SIZE (SZ_1M*13) +#ifndef __ASSEMBLY__ + +extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size, + unsigned int mtype, void *caller); + +#endif #endif |