diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-03-25 14:53:08 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 16:30:01 +0800 |
| commit | 633ef4c7d18982d184242d42056c622a433d93fe (patch) | |
| tree | 083c25c02198299cd32d855ffd4b35224e4f7771 /arch/arm/mach-mxs/mach-mxs.c | |
| parent | 3ed628a8122112ee796cd643e2478c4a6def234c (diff) | |
| download | op-kernel-dev-633ef4c7d18982d184242d42056c622a433d93fe.zip op-kernel-dev-633ef4c7d18982d184242d42056c622a433d93fe.tar.gz | |
ARM: mxs: use CLKSRC_OF helper to initialize timer
Select CLKSRC_OF and use clocksource_of_init() to initialize timer, so
that the call to mxs_timer_init() in clock driver can be removed.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-mxs/mach-mxs.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index e7b781d..c1c0fb4 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c @@ -12,6 +12,7 @@ #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/clocksource.h> #include <linux/can/platform/flexcan.h> #include <linux/delay.h> #include <linux/err.h> @@ -168,11 +169,13 @@ static struct of_dev_auxdata mxs_auxdata_lookup[] __initdata = { static void __init imx23_timer_init(void) { mx23_clocks_init(); + clocksource_of_init(); } static void __init imx28_timer_init(void) { mx28_clocks_init(); + clocksource_of_init(); } enum mac_oui { |
