UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Lee Jones 2013-11-06 10:05:48 +00:00 committed by Linus Walleij
parent c96e476816
commit ac9c0cf119
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/mach-ux500/timer.c
View File

@ -27,18 +27,11 @@ static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
static void __init ux500_twd_init(void) static void __init ux500_twd_init(void)
{ {
struct twd_local_timer *twd_local_timer; struct twd_local_timer *twd_local_timer;
int err;
/* Use this to switch local timer base if changed in new ASICs */ /* Use this to switch local timer base if changed in new ASICs */
twd_local_timer = &u8500_twd_local_timer; twd_local_timer = &u8500_twd_local_timer;
if (of_have_populated_dt()) clocksource_of_init();
clocksource_of_init();
else {
err = twd_local_timer_register(twd_local_timer);
if (err)
pr_err("twd_local_timer_register failed %d\n", err);
}
} }
#else #else
#define ux500_twd_init() do { } while(0) #define ux500_twd_init() do { } while(0)
@ -63,20 +56,15 @@ void __init ux500_timer_init(void)
ux500_unknown_soc(); ux500_unknown_soc();
} }
/* TODO: Once MTU has been DT:ed place code above into else. */ np = of_find_matching_node(NULL, prcmu_timer_of_match);
if (of_have_populated_dt()) { if (!np)
#ifdef CONFIG_OF goto dt_fail;
np = of_find_matching_node(NULL, prcmu_timer_of_match);
if (!np)
#endif
goto dt_fail;
tmp_base = of_iomap(np, 0); tmp_base = of_iomap(np, 0);
if (!tmp_base) if (!tmp_base)
goto dt_fail; goto dt_fail;
prcmu_timer_base = tmp_base; prcmu_timer_base = tmp_base;
}
dt_fail: dt_fail:
/* Doing it the old fashioned way. */ /* Doing it the old fashioned way. */