diff options
| author | Barry Song <Baohua.Song@csr.com> | 2012-12-20 13:33:49 +0400 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2013-01-22 15:38:24 +0400 |
| commit | 0d5983a62ad5749068a507e0c579af88f4753261 (patch) | |
| tree | 6931850f61dc121718e1de05ca438263c409696c /arch/arm/mach-prima2/common.c | |
| parent | ea38960fb63ab5cce2442fa88f5041bcfb1ae8e3 (diff) | |
| download | linux-0d5983a62ad5749068a507e0c579af88f4753261.tar.xz | |
ARM: PRIMA2: mv timer to timer-prima2 as we will add timer-marco
Marco timer has different timer IP with prima2, so rename the current timer
to timer-prima2 so that we can add timer-marco.
at the same time, if we don't find prima2 timer node in dt, don't panic the
system as we will make prima2 and marco use same kernel image.
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Diffstat (limited to 'arch/arm/mach-prima2/common.c')
| -rw-r--r-- | arch/arm/mach-prima2/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index ed3570e5eb8f..8e6f6681b546 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c @@ -40,7 +40,7 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") /* Maintainer: Barry Song <baohua.song@csr.com> */ .map_io = sirfsoc_map_lluart, .init_irq = sirfsoc_of_irq_init, - .init_time = sirfsoc_timer_init, + .init_time = sirfsoc_prima2_timer_init, .dma_zone_size = SZ_256M, .init_machine = sirfsoc_mach_init, .init_late = sirfsoc_init_late, |