Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/mach-msm/board-dt-8660.c

+0 −1
Original line number Diff line number Diff line
@@ -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 = {

arch/arm/mach-msm/common.h

+10 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-msm/include/mach/board.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

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

+0 −7
Original line number Diff line number Diff line
@@ -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

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

+0 −4
Original line number Diff line number Diff line
@@ -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