Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lee Jones and committed by
Linus Walleij
ac9c0cf1 c96e4768

+8 -20
+8 -20
arch/arm/mach-ux500/timer.c
··· 27 27 static void __init ux500_twd_init(void) 28 28 { 29 29 struct twd_local_timer *twd_local_timer; 30 - int err; 31 30 32 31 /* Use this to switch local timer base if changed in new ASICs */ 33 32 twd_local_timer = &u8500_twd_local_timer; 34 33 35 - if (of_have_populated_dt()) 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 - } 34 + clocksource_of_init(); 42 35 } 43 36 #else 44 37 #define ux500_twd_init() do { } while(0) ··· 56 63 ux500_unknown_soc(); 57 64 } 58 65 59 - /* TODO: Once MTU has been DT:ed place code above into else. */ 60 - if (of_have_populated_dt()) { 61 - #ifdef CONFIG_OF 62 - np = of_find_matching_node(NULL, prcmu_timer_of_match); 63 - if (!np) 64 - #endif 65 - goto dt_fail; 66 + np = of_find_matching_node(NULL, prcmu_timer_of_match); 67 + if (!np) 68 + goto dt_fail; 66 69 67 - tmp_base = of_iomap(np, 0); 68 - if (!tmp_base) 69 - goto dt_fail; 70 + tmp_base = of_iomap(np, 0); 71 + if (!tmp_base) 72 + goto dt_fail; 70 73 71 - prcmu_timer_base = tmp_base; 72 - } 74 + prcmu_timer_base = tmp_base; 73 75 74 76 dt_fail: 75 77 /* Doing it the old fashioned way. */