summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorEzequiel Garcia2013-08-13 16:43:12 +0200
committerDaniel Lezcano2013-09-02 21:44:01 +0200
commit573145f08c2b92c45498468afbbba909f6ce6135 (patch)
treeb04251a5544f8d1d42205fc069de801999ba6a50 /arch/arm
parentclocksource: armada-370-xp: Simplify TIMER_CTRL register access (diff)
downloadkernel-qcow2-linux-573145f08c2b92c45498468afbbba909f6ce6135.tar.gz
kernel-qcow2-linux-573145f08c2b92c45498468afbbba909f6ce6135.tar.xz
kernel-qcow2-linux-573145f08c2b92c45498468afbbba909f6ce6135.zip
clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE
This is almost cosmetic: we achieve a bit of consistency with other clocksource drivers by using the CLOCKSOURCE_OF_DECLARE macro for the boilerplate code. Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mvebu/armada-370-xp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 97cbb8021919..4ea03ad41179 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -18,7 +18,7 @@
#include <linux/of_address.h>
#include <linux/of_platform.h>
#include <linux/io.h>
-#include <linux/time-armada-370-xp.h>
+#include <linux/clocksource.h>
#include <linux/dma-mapping.h>
#include <linux/mbus.h>
#include <asm/hardware/cache-l2x0.h>
@@ -69,7 +69,7 @@ static void __init armada_370_xp_mbus_init(void)
static void __init armada_370_xp_timer_and_clk_init(void)
{
of_clk_init(NULL);
- armada_370_xp_timer_init();
+ clocksource_of_init();
coherency_init();
armada_370_xp_mbus_init();
#ifdef CONFIG_CACHE_L2X0