diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2012-09-05 15:28:54 -0400 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2012-09-13 14:14:54 -0400 |
commit | 8407116075eca1d8d22a466759c3d38678b9dd12 (patch) | |
tree | a9d52c38721cab4091a40182153044c7be096bff /arch/arm/mach-msm | |
parent | 6e3321631ac2eca99b3289b83ea1f290b1a8bd92 (diff) |
ARM: msm: Move 8660 to DT timer
Add the timer entry and point the machine descriptor to the
device tree based msm timer.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
[davidb@codeaurora.org: Remove leading zeros]
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r-- | arch/arm/mach-msm/board-msm8x60.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c index 93f90410d0dd..a28a20e2f118 100644 --- a/arch/arm/mach-msm/board-msm8x60.c +++ b/arch/arm/mach-msm/board-msm8x60.c | |||
@@ -159,7 +159,7 @@ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") | |||
159 | .handle_irq = gic_handle_irq, | 159 | .handle_irq = gic_handle_irq, |
160 | .init_machine = msm8x60_dt_init, | 160 | .init_machine = msm8x60_dt_init, |
161 | .init_late = msm8x60_init_late, | 161 | .init_late = msm8x60_init_late, |
162 | .timer = &msm8x60_timer, | 162 | .timer = &msm_dt_timer, |
163 | .dt_compat = msm8x60_fluid_match, | 163 | .dt_compat = msm8x60_fluid_match, |
164 | MACHINE_END | 164 | MACHINE_END |
165 | #endif /* CONFIG_OF */ | 165 | #endif /* CONFIG_OF */ |