summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-11-06 10:05:48 +0000
committerLinus Walleij <linus.walleij@linaro.org>2013-11-26 21:01:58 +0100
commitac9c0cf1194f547cc9975fbd7e80e1f0643dfb97 (patch)
tree8c91feb217a573984ecded95fdcc0532b541275c /arch/arm/mach-ux500
parentc96e476816393ef9c1dfe35d59203824da998cb4 (diff)
downloadlinux-ac9c0cf1194f547cc9975fbd7e80e1f0643dfb97.tar.bz2
ARM: ux500: Remove checking for DT during timer init
Decomission the non-DT boot path as we are now DT only Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-ux500')
-rw-r--r--arch/arm/mach-ux500/timer.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c
index 05a4ff78b3bd..ca60bbd9361b 100644
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@ -27,18 +27,11 @@ static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
static void __init ux500_twd_init(void)
{
struct twd_local_timer *twd_local_timer;
- int err;
/* Use this to switch local timer base if changed in new ASICs */
twd_local_timer = &u8500_twd_local_timer;
- if (of_have_populated_dt())
- clocksource_of_init();
- else {
- err = twd_local_timer_register(twd_local_timer);
- if (err)
- pr_err("twd_local_timer_register failed %d\n", err);
- }
+ clocksource_of_init();
}
#else
#define ux500_twd_init() do { } while(0)
@@ -63,20 +56,15 @@ void __init ux500_timer_init(void)
ux500_unknown_soc();
}
- /* TODO: Once MTU has been DT:ed place code above into else. */
- if (of_have_populated_dt()) {
-#ifdef CONFIG_OF
- np = of_find_matching_node(NULL, prcmu_timer_of_match);
- if (!np)
-#endif
- goto dt_fail;
+ np = of_find_matching_node(NULL, prcmu_timer_of_match);
+ if (!np)
+ goto dt_fail;
- tmp_base = of_iomap(np, 0);
- if (!tmp_base)
- goto dt_fail;
+ tmp_base = of_iomap(np, 0);
+ if (!tmp_base)
+ goto dt_fail;
- prcmu_timer_base = tmp_base;
- }
+ prcmu_timer_base = tmp_base;
dt_fail:
/* Doing it the old fashioned way. */