Commit ba5d08c0 authored by Daniel Lezcano's avatar Daniel Lezcano

clocksource/drivers: Rename clocksource_probe to timer_probe

The function name is now renamed to 'timer_probe' for consistency with
the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 17273395
...@@ -470,7 +470,7 @@ void __init setup_arch(char **cmdline_p) ...@@ -470,7 +470,7 @@ void __init setup_arch(char **cmdline_p)
void __init time_init(void) void __init time_init(void)
{ {
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
} }
static int __init customize_machine(void) static int __init customize_machine(void)
......
...@@ -120,6 +120,6 @@ void __init time_init(void) ...@@ -120,6 +120,6 @@ void __init time_init(void)
#ifdef CONFIG_COMMON_CLK #ifdef CONFIG_COMMON_CLK
of_clk_init(NULL); of_clk_init(NULL);
#endif #endif
clocksource_probe(); timer_probe();
} }
} }
...@@ -41,7 +41,7 @@ static void __init mediatek_timer_init(void) ...@@ -41,7 +41,7 @@ static void __init mediatek_timer_init(void)
} }
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
}; };
static const char * const mediatek_board_dt_compat[] = { static const char * const mediatek_board_dt_compat[] = {
......
...@@ -497,7 +497,7 @@ void __init omap_init_time(void) ...@@ -497,7 +497,7 @@ void __init omap_init_time(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, false); 2, "timer_sys_ck", NULL, false);
clocksource_probe(); timer_probe();
} }
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX) #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM43XX)
...@@ -506,7 +506,7 @@ void __init omap3_secure_sync32k_timer_init(void) ...@@ -506,7 +506,7 @@ 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, false); 2, "timer_sys_ck", NULL, false);
clocksource_probe(); timer_probe();
} }
#endif /* CONFIG_ARCH_OMAP3 */ #endif /* CONFIG_ARCH_OMAP3 */
...@@ -517,7 +517,7 @@ void __init omap3_gptimer_timer_init(void) ...@@ -517,7 +517,7 @@ void __init omap3_gptimer_timer_init(void)
__omap_sync32k_timer_init(2, "timer_sys_ck", NULL, __omap_sync32k_timer_init(2, "timer_sys_ck", NULL,
1, "timer_sys_ck", "ti,timer-alwon", true); 1, "timer_sys_ck", "ti,timer-alwon", true);
if (of_have_populated_dt()) if (of_have_populated_dt())
clocksource_probe(); timer_probe();
} }
#endif #endif
...@@ -532,7 +532,7 @@ static void __init omap4_sync32k_timer_init(void) ...@@ -532,7 +532,7 @@ static void __init omap4_sync32k_timer_init(void)
void __init omap4_local_timer_init(void) void __init omap4_local_timer_init(void)
{ {
omap4_sync32k_timer_init(); omap4_sync32k_timer_init();
clocksource_probe(); timer_probe();
} }
#endif #endif
...@@ -656,7 +656,7 @@ void __init omap5_realtime_timer_init(void) ...@@ -656,7 +656,7 @@ void __init omap5_realtime_timer_init(void)
omap4_sync32k_timer_init(); omap4_sync32k_timer_init();
realtime_counter_init(); realtime_counter_init();
clocksource_probe(); timer_probe();
} }
#endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */ #endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */
......
...@@ -55,7 +55,7 @@ static void __init rockchip_timer_init(void) ...@@ -55,7 +55,7 @@ static void __init rockchip_timer_init(void)
} }
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
} }
static void __init rockchip_dt_init(void) static void __init rockchip_dt_init(void)
......
...@@ -113,7 +113,7 @@ void __init rcar_gen2_timer_init(void) ...@@ -113,7 +113,7 @@ void __init rcar_gen2_timer_init(void)
#endif /* CONFIG_ARM_ARCH_TIMER */ #endif /* CONFIG_ARM_ARCH_TIMER */
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
} }
struct memory_reserve_config { struct memory_reserve_config {
......
...@@ -124,5 +124,5 @@ void __init spear13xx_timer_init(void) ...@@ -124,5 +124,5 @@ void __init spear13xx_timer_init(void)
clk_put(pclk); clk_put(pclk);
spear_setup_of_timer(); spear_setup_of_timer();
clocksource_probe(); timer_probe();
} }
...@@ -42,7 +42,7 @@ static void __init sun6i_timer_init(void) ...@@ -42,7 +42,7 @@ static void __init sun6i_timer_init(void)
of_clk_init(NULL); of_clk_init(NULL);
if (IS_ENABLED(CONFIG_RESET_CONTROLLER)) if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
sun6i_reset_init(); sun6i_reset_init();
clocksource_probe(); timer_probe();
} }
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family") DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
......
...@@ -407,7 +407,7 @@ static const char * u300_board_compat[] = { ...@@ -407,7 +407,7 @@ static const char * u300_board_compat[] = {
DT_MACHINE_START(U300_DT, "U300 S335/B335 (Device Tree)") DT_MACHINE_START(U300_DT, "U300 S335/B335 (Device Tree)")
.map_io = u300_map_io, .map_io = u300_map_io,
.init_irq = u300_init_irq_dt, .init_irq = u300_init_irq_dt,
.init_time = clocksource_probe, .init_time = timer_probe,
.init_machine = u300_init_machine_dt, .init_machine = u300_init_machine_dt,
.restart = u300_restart, .restart = u300_restart,
.dt_compat = u300_board_compat, .dt_compat = u300_board_compat,
......
...@@ -150,7 +150,7 @@ static void __init zynq_timer_init(void) ...@@ -150,7 +150,7 @@ static void __init zynq_timer_init(void)
{ {
zynq_clock_init(); zynq_clock_init();
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
} }
static struct map_desc zynq_cortex_a9_scu_map __initdata = { static struct map_desc zynq_cortex_a9_scu_map __initdata = {
......
...@@ -70,7 +70,7 @@ void __init time_init(void) ...@@ -70,7 +70,7 @@ void __init time_init(void)
u32 arch_timer_rate; u32 arch_timer_rate;
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
tick_setup_hrtimer_broadcast(); tick_setup_hrtimer_broadcast();
......
...@@ -246,5 +246,5 @@ void __init calibrate_delay(void) ...@@ -246,5 +246,5 @@ void __init calibrate_delay(void)
void __init time_init(void) void __init time_init(void)
{ {
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
} }
...@@ -192,7 +192,7 @@ void __init time_init(void) ...@@ -192,7 +192,7 @@ void __init time_init(void)
{ {
of_clk_init(NULL); of_clk_init(NULL);
setup_cpuinfo_clk(); setup_cpuinfo_clk();
clocksource_probe(); timer_probe();
} }
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
......
...@@ -161,7 +161,7 @@ void __init plat_time_init(void) ...@@ -161,7 +161,7 @@ void __init plat_time_init(void)
} }
} }
clocksource_probe(); timer_probe();
} }
void __init arch_init_irq(void) void __init arch_init_irq(void)
......
...@@ -265,7 +265,7 @@ void __init plat_time_init(void) ...@@ -265,7 +265,7 @@ void __init plat_time_init(void)
(freq%1000000)*100/1000000); (freq%1000000)*100/1000000);
#ifdef CONFIG_CLKSRC_MIPS_GIC #ifdef CONFIG_CLKSRC_MIPS_GIC
update_gic_frequency_dt(); update_gic_frequency_dt();
clocksource_probe(); timer_probe();
#endif #endif
} }
#endif #endif
......
...@@ -64,5 +64,5 @@ void __init plat_time_init(void) ...@@ -64,5 +64,5 @@ void __init plat_time_init(void)
pr_info("CPU Clock: %ldMHz\n", rate / 1000000); pr_info("CPU Clock: %ldMHz\n", rate / 1000000);
mips_hpt_frequency = rate / 2; mips_hpt_frequency = rate / 2;
clocksource_probe(); timer_probe();
} }
...@@ -39,7 +39,7 @@ void __init plat_time_init(void) ...@@ -39,7 +39,7 @@ void __init plat_time_init(void)
struct clk *clk; struct clk *clk;
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
np = of_get_cpu_node(0, NULL); np = of_get_cpu_node(0, NULL);
if (!np) { if (!np) {
......
...@@ -82,5 +82,5 @@ void __init plat_time_init(void) ...@@ -82,5 +82,5 @@ void __init plat_time_init(void)
pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000); pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000);
mips_hpt_frequency = clk_get_rate(clk) / 2; mips_hpt_frequency = clk_get_rate(clk) / 2;
clk_put(clk); clk_put(clk);
clocksource_probe(); timer_probe();
} }
...@@ -20,5 +20,5 @@ void __init plat_time_init(void) ...@@ -20,5 +20,5 @@ void __init plat_time_init(void)
ralink_of_remap(); ralink_of_remap();
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
} }
...@@ -22,7 +22,7 @@ void __init plat_time_init(void) ...@@ -22,7 +22,7 @@ void __init plat_time_init(void)
struct clk *clk; struct clk *clk;
of_clk_init(NULL); of_clk_init(NULL);
clocksource_probe(); timer_probe();
np = of_get_cpu_node(0, NULL); np = of_get_cpu_node(0, NULL);
if (!np) { if (!np) {
......
...@@ -350,7 +350,7 @@ void __init time_init(void) ...@@ -350,7 +350,7 @@ void __init time_init(void)
if (count < 2) if (count < 2)
panic("%d timer is found, it needs 2 timers in system\n", count); panic("%d timer is found, it needs 2 timers in system\n", count);
clocksource_probe(); timer_probe();
} }
TIMER_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init); TIMER_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);
...@@ -119,7 +119,7 @@ static void __init sh_of_mem_reserve(void) ...@@ -119,7 +119,7 @@ static void __init sh_of_mem_reserve(void)
static void __init sh_of_time_init(void) static void __init sh_of_time_init(void)
{ {
pr_info("SH generic board support: scanning for clocksource devices\n"); pr_info("SH generic board support: scanning for clocksource devices\n");
clocksource_probe(); timer_probe();
} }
static void __init sh_of_setup(char **cmdline_p) static void __init sh_of_setup(char **cmdline_p)
......
...@@ -187,7 +187,7 @@ void __init time_init(void) ...@@ -187,7 +187,7 @@ void __init time_init(void)
local_timer_setup(0); local_timer_setup(0);
setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction); setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction);
sched_clock_register(ccount_sched_clock_read, 32, ccount_freq); sched_clock_register(ccount_sched_clock_read, 32, ccount_freq);
clocksource_probe(); timer_probe();
} }
/* /*
......
...@@ -24,7 +24,7 @@ extern struct of_device_id __clksrc_of_table[]; ...@@ -24,7 +24,7 @@ extern struct of_device_id __clksrc_of_table[];
static const struct of_device_id __clksrc_of_table_sentinel static const struct of_device_id __clksrc_of_table_sentinel
__used __section(__clksrc_of_table_end); __used __section(__clksrc_of_table_end);
void __init clocksource_probe(void) void __init timer_probe(void)
{ {
struct device_node *np; struct device_node *np;
const struct of_device_id *match; const struct of_device_id *match;
......
...@@ -253,9 +253,9 @@ extern int clocksource_i8253_init(void); ...@@ -253,9 +253,9 @@ extern int clocksource_i8253_init(void);
OF_DECLARE_1_RET(clksrc, name, compat, fn) OF_DECLARE_1_RET(clksrc, name, compat, fn)
#ifdef CONFIG_CLKSRC_PROBE #ifdef CONFIG_CLKSRC_PROBE
extern void clocksource_probe(void); extern void timer_probe(void);
#else #else
static inline void clocksource_probe(void) {} static inline void timer_probe(void) {}
#endif #endif
#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \ #define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \
......
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