diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 16:29:56 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 16:29:56 +0800 |
| commit | 3ed628a8122112ee796cd643e2478c4a6def234c (patch) | |
| tree | 1e5e352eb501a2afa173989415a8b4896d4999a5 /arch/arm/kernel | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | da4a686a2cfb077a8bfc1697f597e7f86235b822 (diff) | |
| download | kernel_goldelico_gta04-3ed628a8122112ee796cd643e2478c4a6def234c.zip kernel_goldelico_gta04-3ed628a8122112ee796cd643e2478c4a6def234c.tar.gz kernel_goldelico_gta04-3ed628a8122112ee796cd643e2478c4a6def234c.tar.bz2 | |
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/smp_twd.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 3f25650..90525d9 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c @@ -362,25 +362,13 @@ int __init twd_local_timer_register(struct twd_local_timer *tlt) } #ifdef CONFIG_OF -const static struct of_device_id twd_of_match[] __initconst = { - { .compatible = "arm,cortex-a9-twd-timer", }, - { .compatible = "arm,cortex-a5-twd-timer", }, - { .compatible = "arm,arm11mp-twd-timer", }, - { }, -}; - -void __init twd_local_timer_of_register(void) +static void __init twd_local_timer_of_register(struct device_node *np) { - struct device_node *np; int err; if (!is_smp() || !setup_max_cpus) return; - np = of_find_matching_node(NULL, twd_of_match); - if (!np) - return; - twd_ppi = irq_of_parse_and_map(np, 0); if (!twd_ppi) { err = -EINVAL; @@ -398,4 +386,7 @@ void __init twd_local_timer_of_register(void) out: WARN(err, "twd_local_timer_of_register failed (%d)\n", err); } +CLOCKSOURCE_OF_DECLARE(arm_twd_a9, "arm,cortex-a9-twd-timer", twd_local_timer_of_register); +CLOCKSOURCE_OF_DECLARE(arm_twd_a5, "arm,cortex-a5-twd-timer", twd_local_timer_of_register); +CLOCKSOURCE_OF_DECLARE(arm_twd_11mp, "arm,arm11mp-twd-timer", twd_local_timer_of_register); #endif |