From b12e9ba59c83f7df846602b201b64e4ddf28ccee Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 13 Feb 2012 13:27:24 -0600 Subject: 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 Tested-by: David Brown Acked-by: David Brown Cc: Daniel Walker Cc: Bryan Huntsman --- arch/arm/mach-msm/include/mach/io.h | 5 ----- arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'arch/arm/mach-msm/include') 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 -- cgit v1.2.3