diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2012-01-10 19:44:19 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2012-03-13 13:30:31 +0000 |
| commit | 4200b16d58cd34ff8e1616d8ed77417f8fc44864 (patch) | |
| tree | 63fa9b988e46a741006f12874615241cd2aa9fe5 /arch/arm/mach-shmobile/smp-r8a7779.c | |
| parent | 1fcf3a6edde7aeef7a207f8209231dd340a4ea89 (diff) | |
ARM: shmobile: convert to twd_local_timer_register() interface
Add support for the new smp_twd runtime registration interface
to the shmobile platforms, and remove the old compile-time support.
Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/mach-shmobile/smp-r8a7779.c')
| -rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7779.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c index 4fe2e9eaf501..9bb7b8575a1f 100644 --- a/arch/arm/mach-shmobile/smp-r8a7779.c +++ b/arch/arm/mach-shmobile/smp-r8a7779.c @@ -64,6 +64,8 @@ static void __iomem *scu_base_addr(void) static DEFINE_SPINLOCK(scu_lock); static unsigned long tmp; +static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, 0xf0000600, 29); + static void modify_scu_cpu_psr(unsigned long set, unsigned long clr) { void __iomem *scu_base = scu_base_addr(); @@ -82,11 +84,7 @@ unsigned int __init r8a7779_get_core_count(void) { void __iomem *scu_base = scu_base_addr(); -#ifdef CONFIG_HAVE_ARM_TWD - /* twd_base needs to be initialized before percpu_timer_setup() */ - twd_base = (void __iomem *)0xf0000600; -#endif - + shmobile_twd_init(&twd_local_timer); return scu_get_core_count(scu_base); } |