diff options
| author | Alexandre Belloni | 2015-03-12 13:07:30 +0100 |
|---|---|---|
| committer | Nicolas Ferre | 2015-03-16 17:03:04 +0100 |
| commit | bbfc97e1b1b9fb2177a9134f57506eb371638b85 (patch) | |
| tree | e36244006454318bec97b1b704dfb4c2998ae6d2 /arch/arm/mach-at91/at91rm9200_time.c | |
| parent | ARM: at91: at91rm9200: remove deprecated arm_pm_restart (diff) | |
| download | kernel-qcow2-linux-bbfc97e1b1b9fb2177a9134f57506eb371638b85.tar.gz kernel-qcow2-linux-bbfc97e1b1b9fb2177a9134f57506eb371638b85.tar.xz kernel-qcow2-linux-bbfc97e1b1b9fb2177a9134f57506eb371638b85.zip | |
ARM: at91: properly initialize timer
Use clocksource_of_init to initialize the system timer instead of relying on a
custom function.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200_time.c')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200_time.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/arch/arm/mach-at91/at91rm9200_time.c index b00d09555f2b..7d062ab32674 100644 --- a/arch/arm/mach-at91/at91rm9200_time.c +++ b/arch/arm/mach-at91/at91rm9200_time.c @@ -222,7 +222,7 @@ err: /* * ST (system timer) module supports both clockevents and clocksource. */ -void __init at91rm9200_timer_init(void) +static void __init atmel_st_timer_init(struct device_node *node) { /* For device tree enabled device: initialize here */ of_at91rm9200_st_init(); @@ -249,3 +249,5 @@ void __init at91rm9200_timer_init(void) /* register clocksource */ clocksource_register_hz(&clk32k, AT91_SLOW_CLOCK); } +CLOCKSOURCE_OF_DECLARE(atmel_st_timer, "atmel,at91rm9200-st", + atmel_st_timer_init); |