clocksource: cosmetic: Drop OF 'dependency' from symbols
Seeing the 'of' characters in a symbol that is being called from ACPI seems to freak out people. So let's do a bit of pointless renaming so that these folks do feel at home. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Acked-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
ae281cbd26
commit
3722ed2380
19 changed files with 21 additions and 21 deletions
|
@ -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_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -647,7 +647,7 @@ static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",
|
||||||
void __init omap4_local_timer_init(void)
|
void __init omap4_local_timer_init(void)
|
||||||
{
|
{
|
||||||
omap4_sync32k_timer_init();
|
omap4_sync32k_timer_init();
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void __init omap4_local_timer_init(void)
|
void __init omap4_local_timer_init(void)
|
||||||
|
@ -663,7 +663,7 @@ void __init omap5_realtime_timer_init(void)
|
||||||
omap4_sync32k_timer_init();
|
omap4_sync32k_timer_init();
|
||||||
realtime_counter_init();
|
realtime_counter_init();
|
||||||
|
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */
|
#endif /* CONFIG_SOC_OMAP5 || CONFIG_SOC_DRA7XX */
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ static void __init rockchip_timer_init(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
of_clk_init(NULL);
|
of_clk_init(NULL);
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init rockchip_dt_init(void)
|
static void __init rockchip_dt_init(void)
|
||||||
|
|
|
@ -97,7 +97,7 @@ static u32 __init r8a7779_read_mode_pins(void)
|
||||||
static void __init r8a7779_init_time(void)
|
static void __init r8a7779_init_time(void)
|
||||||
{
|
{
|
||||||
r8a7779_clocks_init(r8a7779_read_mode_pins());
|
r8a7779_clocks_init(r8a7779_read_mode_pins());
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *const r8a7779_compat_dt[] __initconst = {
|
static const char *const r8a7779_compat_dt[] __initconst = {
|
||||||
|
|
|
@ -128,7 +128,7 @@ void __init rcar_gen2_timer_init(void)
|
||||||
#endif /* CONFIG_ARM_ARCH_TIMER */
|
#endif /* CONFIG_ARM_ARCH_TIMER */
|
||||||
|
|
||||||
rcar_gen2_clocks_init(mode);
|
rcar_gen2_clocks_init(mode);
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
struct memory_reserve_config {
|
struct memory_reserve_config {
|
||||||
|
|
|
@ -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_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,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_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
|
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
|
||||||
|
|
|
@ -408,7 +408,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_of_init,
|
.init_time = clocksource_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,
|
||||||
|
|
|
@ -44,5 +44,5 @@ void __init ux500_timer_init(void)
|
||||||
|
|
||||||
dt_fail:
|
dt_fail:
|
||||||
clksrc_dbx500_prcmu_init(prcmu_timer_base);
|
clksrc_dbx500_prcmu_init(prcmu_timer_base);
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
|
@ -154,7 +154,7 @@ static void __init zynq_timer_init(void)
|
||||||
|
|
||||||
zynq_clock_init();
|
zynq_clock_init();
|
||||||
of_clk_init(NULL);
|
of_clk_init(NULL);
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct map_desc zynq_cortex_a9_scu_map __initdata = {
|
static struct map_desc zynq_cortex_a9_scu_map __initdata = {
|
||||||
|
|
|
@ -67,7 +67,7 @@ void __init time_init(void)
|
||||||
u32 arch_timer_rate;
|
u32 arch_timer_rate;
|
||||||
|
|
||||||
of_clk_init(NULL);
|
of_clk_init(NULL);
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
|
|
||||||
tick_setup_hrtimer_broadcast();
|
tick_setup_hrtimer_broadcast();
|
||||||
|
|
||||||
|
|
|
@ -194,7 +194,7 @@ void __init time_init(void)
|
||||||
{
|
{
|
||||||
of_clk_init(NULL);
|
of_clk_init(NULL);
|
||||||
setup_cpuinfo_clk();
|
setup_cpuinfo_clk();
|
||||||
clocksource_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_FS
|
#ifdef CONFIG_DEBUG_FS
|
||||||
|
|
|
@ -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_of_init();
|
clocksource_probe();
|
||||||
|
|
||||||
np = of_get_cpu_node(0, NULL);
|
np = of_get_cpu_node(0, NULL);
|
||||||
if (!np) {
|
if (!np) {
|
||||||
|
|
|
@ -75,5 +75,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_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
|
@ -324,7 +324,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_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);
|
CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init);
|
||||||
|
|
|
@ -148,7 +148,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_of_init();
|
clocksource_probe();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
obj-$(CONFIG_CLKSRC_PROBE) += clksrc-of.o
|
obj-$(CONFIG_CLKSRC_PROBE) += clksrc-probe.o
|
||||||
obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o
|
obj-$(CONFIG_ATMEL_PIT) += timer-atmel-pit.o
|
||||||
obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o
|
obj-$(CONFIG_ATMEL_ST) += timer-atmel-st.o
|
||||||
obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o
|
obj-$(CONFIG_ATMEL_TCB_CLKSRC) += tcb_clksrc.o
|
||||||
|
|
|
@ -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_of_init(void)
|
void __init clocksource_probe(void)
|
||||||
{
|
{
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
const struct of_device_id *match;
|
const struct of_device_id *match;
|
|
@ -247,9 +247,9 @@ extern int clocksource_i8253_init(void);
|
||||||
OF_DECLARE_1(clksrc, name, compat, fn)
|
OF_DECLARE_1(clksrc, name, compat, fn)
|
||||||
|
|
||||||
#ifdef CONFIG_CLKSRC_PROBE
|
#ifdef CONFIG_CLKSRC_PROBE
|
||||||
extern void clocksource_of_init(void);
|
extern void clocksource_probe(void);
|
||||||
#else
|
#else
|
||||||
static inline void clocksource_of_init(void) {}
|
static inline void clocksource_probe(void) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \
|
#define CLOCKSOURCE_ACPI_DECLARE(name, table_id, fn) \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue