Commit be0ac4c3 authored by Felipe Balbi's avatar Felipe Balbi

arm: omap2: timer: get rid of obfuscating macros

those macros just make it a lot more difficult
to grep around and actually find similarities.

In this patch, we will simply remove them and
replace with actual functions and later commits
will come to further clean this up.
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0328d816
...@@ -592,53 +592,69 @@ static inline void __init realtime_counter_init(void) ...@@ -592,53 +592,69 @@ static inline void __init realtime_counter_init(void)
{} {}
#endif #endif
#define OMAP_SYS_GP_TIMER_INIT(name, clkev_nr, clkev_src, clkev_prop, \ static void __init __omap_gptimer_init(int clkev_nr, const char *clkev_src,
clksrc_nr, clksrc_src, clksrc_prop) \ const char *clkev_prop, int clksrc_nr, const char *clksrc_src,
void __init omap##name##_gptimer_timer_init(void) \ const char *clksrc_prop)
{ \ {
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);
omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \ omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src, clksrc_prop);
clksrc_prop); \
} }
#define OMAP_SYS_32K_TIMER_INIT(name, clkev_nr, clkev_src, clkev_prop, \ static void __init __omap_sync32k_timer_init(int clkev_nr, const char *clkev_src,
clksrc_nr, clksrc_src, clksrc_prop) \ const char *clkev_prop, int clksrc_nr, const char *clksrc_src,
void __init omap##name##_sync32k_timer_init(void) \ const char *clksrc_prop)
{ \ {
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 */ \
if (use_gptimer_clksrc) \ /* Enable the use of clocksource="gp_timer" kernel parameter */
omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src, \ if (use_gptimer_clksrc)
clksrc_prop); \ omap2_gptimer_clocksource_init(clksrc_nr, clksrc_src,
else \ clksrc_prop);
omap2_sync32k_clocksource_init(); \ else
omap2_sync32k_clocksource_init();
} }
#ifdef CONFIG_ARCH_OMAP2 #ifdef CONFIG_ARCH_OMAP2
OMAP_SYS_32K_TIMER_INIT(2, 1, "timer_32k_ck", "ti,timer-alwon", void __init omap2_sync32k_timer_init(void)
{
__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
2, "timer_sys_ck", NULL); 2, "timer_sys_ck", NULL);
}
#endif /* CONFIG_ARCH_OMAP2 */ #endif /* CONFIG_ARCH_OMAP2 */
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)
OMAP_SYS_32K_TIMER_INIT(3, 1, "timer_32k_ck", "ti,timer-alwon", void __init omap3_sync32k_timer_init(void)
{
__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
2, "timer_sys_ck", NULL); 2, "timer_sys_ck", NULL);
OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure", }
void __init omap3_secure_sync32k_timer_init(void)
{
__omap_sync32k_timer_init(12, "secure_32k_fck", "ti,timer-secure",
2, "timer_sys_ck", NULL); 2, "timer_sys_ck", NULL);
}
#endif /* CONFIG_ARCH_OMAP3 */ #endif /* CONFIG_ARCH_OMAP3 */
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)
OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL, void __init omap3_gptimer_timer_init(void)
{
__omap_gptimer_init(2, "timer_sys_ck", NULL,
1, "timer_sys_ck", "ti,timer-alwon"); 1, "timer_sys_ck", "ti,timer-alwon");
}
#endif #endif
#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \ #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX) defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon", static void __init omap4_sync32k_timer_init(void)
{
__omap_sync32k_timer_init(1, "timer_32k_ck", "ti,timer-alwon",
2, "sys_clkin_ck", NULL); 2, "sys_clkin_ck", NULL);
}
void __init omap4_local_timer_init(void) void __init omap4_local_timer_init(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment