openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: omap2: timer: add a gptimer argument to sync32k_timer_init() 

as it turns out, __omap_gptimer_init() and
__omap_sync32k_timer_init() are essentially
the same thing, but __omap_gptimer_init() wants
to always use gptimer.

Instead of forcing all those devices to pass
a use_gptimer cmdline argument, we add a new
function argument to __omap_sync32k_timer_init()
in preparation to deleting __omap_gptimer_init().

On a follow-up patch, we will remove uses of
__omap_gptimer_init() and replace them with
__omap_sync32k_timer_init() and pass the last
argument as true.

Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Felipe Balbi 2015-09-29 11:38:48 -05:00
parent be0ac4c374
commit f5409092d4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-omap2/timer.c
View File

@ -604,14 +604,14 @@ static void __init __omap_gptimer_init(int clkev_nr, const char *clkev_src,
static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src, static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src,
const char *clkev_prop, int clksrc_nr, const char *clksrc_src, const char *clkev_prop, int clksrc_nr, const char *clksrc_src,
const char *clksrc_prop) const char *clksrc_prop, bool gptimer)
{ {
omap_clk_init(); omap_clk_init();
omap_dmtimer_init(); omap_dmtimer_init();
omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop); omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop);
/* Enable the use of clocksource="gp_timer" kernel parameter */ /* Enable the use of clocksource="gp_timer" kernel parameter */
if (use_gptimer_clksrc) if (use_gptimer_clksrc || gptimer)
omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src, omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src,
clksrc_prop); clksrc_prop);
else else
@ -622,7 +622,7 @@ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src
void __init omap2_sync32k_timer_init(void) void __init omap2_sync32k_timer_init(void)
{ {
__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon", __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
2, "timer_sys_ck", NULL); 2, "timer_sys_ck", NULL, false);
} }
#endif /* CONFIG_ARCH_OMAP2 */ #endif /* CONFIG_ARCH_OMAP2 */
@ -630,13 +630,13 @@ void __init omap2_sync32k_timer_init(void)
void __init omap3_sync32k_timer_init(void) void __init omap3_sync32k_timer_init(void)
{ {
__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon", __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
2, "timer_sys_ck", NULL); 2, "timer_sys_ck", NULL, false);
} }
void __init omap3_secure_sync32k_timer_init(void) void __init omap3_secure_sync32k_timer_init(void)
{ {
__omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure", __omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",
2, "timer_sys_ck", NULL); 2, "timer_sys_ck", NULL, false);
} }
#endif /* CONFIG_ARCH_OMAP3 */ #endif /* CONFIG_ARCH_OMAP3 */
@ -653,7 +653,7 @@ void __init omap3_gptimer_timer_init(void)
static void __init omap4_sync32k_timer_init(void) static void __init omap4_sync32k_timer_init(void)
{ {
__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon", __omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
2, "sys_clkin_ck", NULL); 2, "sys_clkin_ck", NULL, false);
} }
void __init omap4_local_timer_init(void) void __init omap4_local_timer_init(void)