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

arm: omap2: timer: remove __omap_gptimer_init() 

__omap_sync32k_timer_init(), now takes the clock
source as a parameter. This means we no longer need
__omap_gptimer_init().

Note that __omap_sync32k_timer_init() will be
renamed in a follow-up patch as it's not longer 32k
source specific.

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

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

@ -592,16 +592,6 @@ static inline void __init realtime_counter_init(void)
{} {}
#endif #endif
static void __init __omap_gptimer_init(int clkev_nr, const char *clkev_src,
const char *clkev_prop, int clksrc_nr, const char *clksrc_src,
const char *clksrc_prop)
{
omap_clk_init();
omap_dmtimer_init();
omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop);
omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src, clksrc_prop);
}
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, bool gptimer) const char *clksrc_prop, bool gptimer)
@ -643,8 +633,8 @@ void __init omap3_secure_sync32k_timer_init(void)
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)
void __init omap3_gptimer_timer_init(void) void __init omap3_gptimer_timer_init(void)
{ {
__omap_gptimer_init(2, "timer_sys_ck", NULL, __omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
1, "timer_sys_ck", "ti,timer-alwon"); 1, "timer_sys_ck", "ti,timer-alwon", true);
} }
#endif #endif