diff options
author | Felipe Balbi <balbi@ti.com> | 2015-09-29 12:44:47 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-10-15 17:11:39 -0400 |
commit | a5f72ebaead454f95b8e6f353684681640b29ee3 (patch) | |
tree | adbdd0d7415fa3e3be147eda3de7d8971611d648 /arch/arm/mach-omap2/timer.c | |
parent | f5409092d4dbb4aaeee18e16143adf63c7506dc5 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
-rw-r--r-- | arch/arm/mach-omap2/timer.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index f53ed049d710..976ff9fa3594 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c | |||
@@ -592,16 +592,6 @@ static inline void __init realtime_counter_init(void) | |||
592 | {} | 592 | {} |
593 | #endif | 593 | #endif |
594 | 594 | ||
595 | static void __init __omap_gptimer_init(int clkev_nr, const char *clkev_src, | ||
596 | const char *clkev_prop, int clksrc_nr, const char *clksrc_src, | ||
597 | const char *clksrc_prop) | ||
598 | { | ||
599 | omap_clk_init(); | ||
600 | omap_dmtimer_init(); | ||
601 | omap2_gp_clockevent_init(clkev_nr, clkev_src, clkev_prop); | ||
602 | omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src, clksrc_prop); | ||
603 | } | ||
604 | |||
605 | static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src, | 595 | static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src, |
606 | const char *clkev_prop, int clksrc_nr, const char *clksrc_src, | 596 | const char *clkev_prop, int clksrc_nr, const char *clksrc_src, |
607 | const char *clksrc_prop, bool gptimer) | 597 | const char *clksrc_prop, bool gptimer) |
@@ -643,8 +633,8 @@ void __init omap3_secure_sync32k_timer_init(void) | |||
643 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) | 633 | #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) |
644 | void __init omap3_gptimer_timer_init(void) | 634 | void __init omap3_gptimer_timer_init(void) |
645 | { | 635 | { |
646 | __omap_gptimer_init(2, "timer_sys_ck", NULL, | 636 | __omap_sync32k_timer_init(2, "timer_sys_ck", NULL, |
647 | 1, "timer_sys_ck", "ti,timer-alwon"); | 637 | 1, "timer_sys_ck", "ti,timer-alwon", true); |
648 | } | 638 | } |
649 | #endif | 639 | #endif |
650 | 640 | ||