ARM: msm: Move io mapping prototypes to common.h
authorStephen Boyd <sboyd@codeaurora.org>
Wed, 5 Sep 2012 19:28:57 +0000 (12:28 -0700)
committerDavid Brown <davidb@codeaurora.org>
Thu, 13 Sep 2012 18:16:26 +0000 (11:16 -0700)
Consolidate the handful of iomapping functions into common.h so
that board files don't need to include mach/msm_iomap.h if they
don't need static virtual mapping addresses.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
arch/arm/mach-msm/board-dt-8660.c
arch/arm/mach-msm/common.h
arch/arm/mach-msm/include/mach/board.h
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
arch/arm/mach-msm/include/mach/msm_iomap-8960.h
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
arch/arm/mach-msm/io.c

index fdbed439855a42098e9649cf61dcbb4c848db9ea..c1ddd480fc87839a3ef7d232a17575e2fb26d027 100644 (file)
@@ -19,7 +19,6 @@
 #include <asm/hardware/gic.h>
 
 #include <mach/board.h>
-#include <mach/msm_iomap.h>
 #include "common.h"
 
 static const struct of_device_id msm_dt_gic_match[] __initconst = {
index a20e78e58b0d937f02050260a1b9abb25e345ed6..9975575a81b9273b1ddaeefc64e669e750a595e5 100644 (file)
@@ -18,4 +18,14 @@ extern struct sys_timer msm8960_timer;
 extern struct sys_timer msm_dt_timer;
 extern struct sys_timer qsd8x50_timer;
 
+extern void msm_map_common_io(void);
+extern void msm_map_msm7x30_io(void);
+extern void msm_map_msm8x60_io(void);
+extern void msm_map_msm8960_io(void);
+extern void msm_map_qsd8x50_io(void);
+
+extern void __iomem *__msm_ioremap_caller(unsigned long phys_addr, size_t size,
+                                         unsigned int mtype, void *caller);
+
+
 #endif
index fc40bbc18e4182bde62116ecc538bc9aa309d8da..09654aca6152c87088cd8d19dfc79c98de9c5ad4 100644 (file)
@@ -36,7 +36,6 @@ struct clk_lookup;
 /* common init routines for use by arch/arm/mach-msm/board-*.c */
 
 void __init msm_add_devices(void);
-void __init msm_map_common_io(void);
 void __init msm_init_irq(void);
 void __init msm_init_gpio(void);
 void __init msm_clock_init(struct clk_lookup *clock_tbl, unsigned num_clocks);
index 6c4046c21296c976e7352a8c260bf661be090324..67dc0e98b958ae281185fcc6523783351cc6b66e 100644 (file)
 #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
index f944fe65a657c4847bbeadfa1a7973d4503ea1ca..198202c267c846d6375be0f59bf2aad38eba277a 100644 (file)
 #define MSM_HSUSB_PHYS        0xA3600000
 #define MSM_HSUSB_SIZE        SZ_1K
 
-#ifndef __ASSEMBLY__
-extern void msm_map_msm7x30_io(void);
-#endif
-
 #endif
index a1752c0284fca2e25ebdd74d100c6442c8799b1c..800b55767e6b83ee7856692bf4e8fcf122df5863 100644 (file)
@@ -50,8 +50,4 @@
 #define MSM_DEBUG_UART_PHYS    0x16440000
 #endif
 
-#ifndef __ASSEMBLY__
-extern void msm_map_msm8960_io(void);
-#endif
-
 #endif
index da77cc1d545d0158949eda6c3042d57ff9e2566a..0faa894729b7737d2c310f890aa27bd339506ec8 100644 (file)
 #define MSM_SDC4_PHYS          0xA0600000
 #define MSM_SDC4_SIZE          SZ_4K
 
-#ifndef __ASSEMBLY__
-extern void msm_map_qsd8x50_io(void);
-#endif
-
 #endif
index 5aed57dc808c081f13c99f5d6ed0883c4ba46b56..54e12caa8d860a99a4d6c4e11505e25a7d269d62 100644 (file)
@@ -67,8 +67,4 @@
 #define MSM_DEBUG_UART_PHYS    0x19C40000
 #endif
 
-#ifndef __ASSEMBLY__
-extern void msm_map_msm8x60_io(void);
-#endif
-
 #endif
index a1e7b11688500fb0e08040dbe4ddaf7f95f6eabf..3cbe74a41d9bd66954bfc4b698db7a269b9f3a1b 100644 (file)
@@ -29,6 +29,8 @@
 
 #include <mach/board.h>
 
+#include "common.h"
+
 #define MSM_CHIP_DEVICE(name, chip) {                        \
                .virtual = (unsigned long) MSM_##name##_BASE, \
                .pfn = __phys_to_pfn(chip##_##name##_PHYS), \