dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
This commit is contained in:
Stephen Boyd 2012-09-05 12:28:57 -07:00 committed by David Brown
parent 5a6e814f5d
commit 85a9f0f576
9 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-msm/board-dt-8660.c
View 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 = {

10
arch/arm/mach-msm/common.h
View 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

1
arch/arm/mach-msm/include/mach/board.h
View 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);

7
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
View File

@ -105,11 +105,4 @@
#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

4
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
View File

@ -100,8 +100,4 @@
#define MSM_HSUSB_PHYS 0xA3600000
#define MSM_HSUSB_SIZE SZ_1K
#ifndef __ASSEMBLY__
extern void msm_map_msm7x30_io(void);
#endif
#endif

4
arch/arm/mach-msm/include/mach/msm_iomap-8960.h
View File

@ -50,8 +50,4 @@
#define MSM_DEBUG_UART_PHYS 0x16440000
#endif
#ifndef __ASSEMBLY__
extern void msm_map_msm8960_io(void);
#endif
#endif

4
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
View File

@ -122,8 +122,4 @@
#define MSM_SDC4_PHYS 0xA0600000
#define MSM_SDC4_SIZE SZ_4K
#ifndef __ASSEMBLY__
extern void msm_map_qsd8x50_io(void);
#endif
#endif

4
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
View File

@ -67,8 +67,4 @@
#define MSM_DEBUG_UART_PHYS 0x19C40000
#endif
#ifndef __ASSEMBLY__
extern void msm_map_msm8x60_io(void);
#endif
#endif

2
arch/arm/mach-msm/io.c
View 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), \