diff options
author | Lee Jones <lee.jones@linaro.org> | 2013-11-06 05:05:48 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-26 15:01:58 -0500 |
commit | ac9c0cf1194f547cc9975fbd7e80e1f0643dfb97 (patch) | |
tree | 8c91feb217a573984ecded95fdcc0532b541275c /arch/arm/mach-ux500 | |
parent | c96e476816393ef9c1dfe35d59203824da998cb4 (diff) |
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.c | 28 |
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, | |||
27 | static void __init ux500_twd_init(void) | 27 | static void __init ux500_twd_init(void) |
28 | { | 28 | { |
29 | struct twd_local_timer *twd_local_timer; | 29 | struct twd_local_timer *twd_local_timer; |
30 | int err; | ||
31 | 30 | ||
32 | /* Use this to switch local timer base if changed in new ASICs */ | 31 | /* Use this to switch local timer base if changed in new ASICs */ |
33 | twd_local_timer = &u8500_twd_local_timer; | 32 | twd_local_timer = &u8500_twd_local_timer; |
34 | 33 | ||
35 | if (of_have_populated_dt()) | 34 | clocksource_of_init(); |
36 | clocksource_of_init(); | ||
37 | else { | ||
38 | err = twd_local_timer_register(twd_local_timer); | ||
39 | if (err) | ||
40 | pr_err("twd_local_timer_register failed %d\n", err); | ||
41 | } | ||
42 | } | 35 | } |
43 | #else | 36 | #else |
44 | #define ux500_twd_init() do { } while(0) | 37 | #define ux500_twd_init() do { } while(0) |
@@ -63,20 +56,15 @@ void __init ux500_timer_init(void) | |||
63 | ux500_unknown_soc(); | 56 | ux500_unknown_soc(); |
64 | } | 57 | } |
65 | 58 | ||
66 | /* TODO: Once MTU has been DT:ed place code above into else. */ | 59 | np = of_find_matching_node(NULL, prcmu_timer_of_match); |
67 | if (of_have_populated_dt()) { | 60 | if (!np) |
68 | #ifdef CONFIG_OF | 61 | goto dt_fail; |
69 | np = of_find_matching_node(NULL, prcmu_timer_of_match); | ||
70 | if (!np) | ||
71 | #endif | ||
72 | goto dt_fail; | ||
73 | 62 | ||
74 | tmp_base = of_iomap(np, 0); | 63 | tmp_base = of_iomap(np, 0); |
75 | if (!tmp_base) | 64 | if (!tmp_base) |
76 | goto dt_fail; | 65 | goto dt_fail; |
77 | 66 | ||
78 | prcmu_timer_base = tmp_base; | 67 | prcmu_timer_base = tmp_base; |
79 | } | ||
80 | 68 | ||
81 | dt_fail: | 69 | dt_fail: |
82 | /* Doing it the old fashioned way. */ | 70 | /* Doing it the old fashioned way. */ |