diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2012-09-05 19:28:52 (GMT) |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2012-09-13 18:14:37 (GMT) |
| commit | 4312a7ef9cd744849e16ef4bdeb7ca6beec9ec76 (patch) | |
| tree | 6e42fe0cfabf49a6126954b5b726c8a448169c85 /arch/arm/mach-msm/board-msm8x60.c | |
| parent | 66a8950949c12a2600ff62e78b24f42ef8f6d28e (diff) | |
| download | linux-fsl-qoriq-4312a7ef9cd744849e16ef4bdeb7ca6beec9ec76.tar.xz | |
ARM: msm: Allow timer.c to compile on multiple targets
The timer code relies on #defines from mach/iomap.h, cpu_is_*()
checks, and a global irq #define. All this makes this file
impossible to compile in a mult-target build. Therefore, make a
sys_timer struct for each SoC so that machine descriptors can
reference the correct timer. Then go through and replace all the
defines with raw values that are passed to a common
initialization function.
This paves the way to adding DT support to this code as well as
allows us to compile this file on multiple targets at the same
time.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/board-msm8x60.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm8x60.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c index 9df5c83..93f9041 100644 --- a/arch/arm/mach-msm/board-msm8x60.c +++ b/arch/arm/mach-msm/board-msm8x60.c @@ -28,6 +28,7 @@ #include <mach/board.h> #include <mach/msm_iomap.h> +#include "common.h" static void __init msm8x60_fixup(struct tag *tag, char **cmdline, struct meminfo *mi) @@ -114,7 +115,7 @@ MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3") .handle_irq = gic_handle_irq, .init_machine = msm8x60_init, .init_late = msm8x60_init_late, - .timer = &msm_timer, + .timer = &msm8x60_timer, MACHINE_END MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF") @@ -125,7 +126,7 @@ MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF") .handle_irq = gic_handle_irq, .init_machine = msm8x60_init, .init_late = msm8x60_init_late, - .timer = &msm_timer, + .timer = &msm8x60_timer, MACHINE_END MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR") @@ -136,7 +137,7 @@ MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR") .handle_irq = gic_handle_irq, .init_machine = msm8x60_init, .init_late = msm8x60_init_late, - .timer = &msm_timer, + .timer = &msm8x60_timer, MACHINE_END MACHINE_START(MSM8X60_FFA, "QCT MSM8X60 FFA") @@ -147,7 +148,7 @@ MACHINE_START(MSM8X60_FFA, "QCT MSM8X60 FFA") .handle_irq = gic_handle_irq, .init_machine = msm8x60_init, .init_late = msm8x60_init_late, - .timer = &msm_timer, + .timer = &msm8x60_timer, MACHINE_END #ifdef CONFIG_OF @@ -158,7 +159,7 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") .handle_irq = gic_handle_irq, .init_machine = msm8x60_dt_init, .init_late = msm8x60_init_late, - .timer = &msm_timer, + .timer = &msm8x60_timer, .dt_compat = msm8x60_fluid_match, MACHINE_END #endif /* CONFIG_OF */ |