Commit 85a9f0f5 authored by Stephen Boyd's avatar Stephen Boyd Committed by David Brown

ARM: msm: Move io mapping prototypes to common.h

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: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 5a6e814f
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
#include <mach/board.h> #include <mach/board.h>
#include <mach/msm_iomap.h>
#include "common.h" #include "common.h"
static const struct of_device_id msm_dt_gic_match[] __initconst = { static const struct of_device_id msm_dt_gic_match[] __initconst = {
......
...@@ -18,4 +18,14 @@ extern struct sys_timer msm8960_timer; ...@@ -18,4 +18,14 @@ extern struct sys_timer msm8960_timer;
extern struct sys_timer msm_dt_timer; extern struct sys_timer msm_dt_timer;
extern struct sys_timer qsd8x50_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 #endif
...@@ -36,7 +36,6 @@ struct clk_lookup; ...@@ -36,7 +36,6 @@ struct clk_lookup;
/* common init routines for use by arch/arm/mach-msm/board-*.c */ /* common init routines for use by arch/arm/mach-msm/board-*.c */
void __init msm_add_devices(void); void __init msm_add_devices(void);
void __init msm_map_common_io(void);
void __init msm_init_irq(void); void __init msm_init_irq(void);
void __init msm_init_gpio(void); void __init msm_init_gpio(void);
void __init msm_clock_init(struct clk_lookup *clock_tbl, unsigned num_clocks); void __init msm_clock_init(struct clk_lookup *clock_tbl, unsigned num_clocks);
......
...@@ -105,11 +105,4 @@ ...@@ -105,11 +105,4 @@
#define MSM_AD5_PHYS 0xAC000000 #define MSM_AD5_PHYS 0xAC000000
#define MSM_AD5_SIZE (SZ_1M*13) #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 #endif
...@@ -100,8 +100,4 @@ ...@@ -100,8 +100,4 @@
#define MSM_HSUSB_PHYS 0xA3600000 #define MSM_HSUSB_PHYS 0xA3600000
#define MSM_HSUSB_SIZE SZ_1K #define MSM_HSUSB_SIZE SZ_1K
#ifndef __ASSEMBLY__
extern void msm_map_msm7x30_io(void);
#endif
#endif #endif
...@@ -50,8 +50,4 @@ ...@@ -50,8 +50,4 @@
#define MSM_DEBUG_UART_PHYS 0x16440000 #define MSM_DEBUG_UART_PHYS 0x16440000
#endif #endif
#ifndef __ASSEMBLY__
extern void msm_map_msm8960_io(void);
#endif
#endif #endif
...@@ -122,8 +122,4 @@ ...@@ -122,8 +122,4 @@
#define MSM_SDC4_PHYS 0xA0600000 #define MSM_SDC4_PHYS 0xA0600000
#define MSM_SDC4_SIZE SZ_4K #define MSM_SDC4_SIZE SZ_4K
#ifndef __ASSEMBLY__
extern void msm_map_qsd8x50_io(void);
#endif
#endif #endif
...@@ -67,8 +67,4 @@ ...@@ -67,8 +67,4 @@
#define MSM_DEBUG_UART_PHYS 0x19C40000 #define MSM_DEBUG_UART_PHYS 0x19C40000
#endif #endif
#ifndef __ASSEMBLY__
extern void msm_map_msm8x60_io(void);
#endif
#endif #endif
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
#include <mach/board.h> #include <mach/board.h>
#include "common.h"
#define MSM_CHIP_DEVICE(name, chip) { \ #define MSM_CHIP_DEVICE(name, chip) { \
.virtual = (unsigned long) MSM_##name##_BASE, \ .virtual = (unsigned long) MSM_##name##_BASE, \
.pfn = __phys_to_pfn(chip##_##name##_PHYS), \ .pfn = __phys_to_pfn(chip##_##name##_PHYS), \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment