leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clocksource/drivers: Rename clksrc table to timer

Browse Source 
The table name is now renamed to 'timer' for consistency with
the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Daniel Lezcano 2017-05-26 18:33:27 +02:00
parent 77d62f5322
commit 2fcc112af3
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/clocksource/clksrc-probe.c
View File

@ -19,20 +19,20 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/clocksource.h> #include <linux/clocksource.h>
extern struct of_device_id __clksrc_of_table[]; extern struct of_device_id __timer_of_table[];
static const struct of_device_id __clksrc_of_table_sentinel static const struct of_device_id __timer_of_table_sentinel
__used __section(__clksrc_of_table_end); __used __section(__timer_of_table_end);
void __init timer_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;
of_init_fn_1_ret init_func_ret; of_init_fn_1_ret init_func_ret;
unsigned clocksources = 0; unsigned timers = 0;
int ret; int ret;
for_each_matching_node_and_match(np, __clksrc_of_table, &match) { for_each_matching_node_and_match(np, __timer_of_table, &match) {
if (!of_device_is_available(np)) if (!of_device_is_available(np))
continue; continue;
@ -45,11 +45,11 @@ void __init timer_probe(void)
continue; continue;
} }
clocksources++; timers++;
} }
clocksources += acpi_probe_device_table(clksrc); timers += acpi_probe_device_table(timer);
if (!clocksources) if (!timers)
pr_crit("%s: no matching clocksources found\n", __func__); pr_crit("%s: no matching timers found\n", __func__);
} }

7
include/asm-generic/vmlinux.lds.h
View File

@ -172,7 +172,7 @@
KEEP(*(__##name##_of_table)) \ KEEP(*(__##name##_of_table)) \
KEEP(*(__##name##_of_table_end)) KEEP(*(__##name##_of_table_end))
#define CLKSRC_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, clksrc) #define TIMER_OF_TABLES() OF_TABLE(CONFIG_CLKSRC_OF, timer)
#define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip) #define IRQCHIP_OF_MATCH_TABLE() OF_TABLE(CONFIG_IRQCHIP, irqchip)
#define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk) #define CLK_OF_TABLES() OF_TABLE(CONFIG_COMMON_CLK, clk)
#define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu) #define IOMMU_OF_TABLES() OF_TABLE(CONFIG_OF_IOMMU, iommu)
@ -556,14 +556,15 @@
MEM_DISCARD(init.rodata) \ MEM_DISCARD(init.rodata) \
CLK_OF_TABLES() \ CLK_OF_TABLES() \
RESERVEDMEM_OF_TABLES() \ RESERVEDMEM_OF_TABLES() \
CLKSRC_OF_TABLES() \ TIMER_OF_TABLES() \
IOMMU_OF_TABLES() \ IOMMU_OF_TABLES() \
CPU_METHOD_OF_TABLES() \ CPU_METHOD_OF_TABLES() \
CPUIDLE_METHOD_OF_TABLES() \ CPUIDLE_METHOD_OF_TABLES() \
KERNEL_DTB() \ KERNEL_DTB() \
IRQCHIP_OF_MATCH_TABLE() \ IRQCHIP_OF_MATCH_TABLE() \
ACPI_PROBE_TABLE(irqchip) \ ACPI_PROBE_TABLE(irqchip) \
ACPI_PROBE_TABLE(clksrc) \ ACPI_PROBE_TABLE(timer) \
ACPI_PROBE_TABLE(iort) \
EARLYCON_TABLE() EARLYCON_TABLE()
#define INIT_TEXT \ #define INIT_TEXT \

4
include/linux/clocksource.h
View File

@ -250,7 +250,7 @@ extern int clocksource_mmio_init(void __iomem *, const char *,
extern int clocksource_i8253_init(void); extern int clocksource_i8253_init(void);
#define TIMER_OF_DECLARE(name, compat, fn) \ #define TIMER_OF_DECLARE(name, compat, fn) \
OF_DECLARE_1_RET(clksrc, name, compat, fn) OF_DECLARE_1_RET(timer, name, compat, fn)
#ifdef CONFIG_CLKSRC_PROBE #ifdef CONFIG_CLKSRC_PROBE
extern void timer_probe(void); extern void timer_probe(void);
@ -259,6 +259,6 @@ static inline void timer_probe(void) {}
#endif #endif
#define TIMER_ACPI_DECLARE(name, table_id, fn) \ #define TIMER_ACPI_DECLARE(name, table_id, fn) \
ACPI_DECLARE_PROBE_ENTRY(clksrc, name, table_id, 0, NULL, 0, fn) ACPI_DECLARE_PROBE_ENTRY(timer, name, table_id, 0, NULL, 0, fn)
#endif /* _LINUX_CLOCKSOURCE_H */ #endif /* _LINUX_CLOCKSOURCE_H */