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 /drivers/clk/mxs | |
parent | 3ed628a8122112ee796cd643e2478c4a6def234c (diff) | |
download | linux-stable-633ef4c7d18982d184242d42056c622a433d93fe.tar.gz linux-stable-633ef4c7d18982d184242d42056c622a433d93fe.tar.bz2 linux-stable-633ef4c7d18982d184242d42056c622a433d93fe.zip |
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 'drivers/clk/mxs')
-rw-r--r-- | drivers/clk/mxs/clk-imx23.c | 3 | ||||
-rw-r--r-- | drivers/clk/mxs/clk-imx28.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/clk/mxs/clk-imx23.c b/drivers/clk/mxs/clk-imx23.c index b5c06f9766f6..291cc44713f4 100644 --- a/drivers/clk/mxs/clk-imx23.c +++ b/drivers/clk/mxs/clk-imx23.c @@ -15,7 +15,6 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/of.h> -#include <mach/common.h> #include <mach/mx23.h> #include "clk.h" @@ -165,7 +164,5 @@ int __init mx23_clocks_init(void) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); - mxs_timer_init(); - return 0; } diff --git a/drivers/clk/mxs/clk-imx28.c b/drivers/clk/mxs/clk-imx28.c index 76ce6c6d1113..d861bfd8c537 100644 --- a/drivers/clk/mxs/clk-imx28.c +++ b/drivers/clk/mxs/clk-imx28.c @@ -15,7 +15,6 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/of.h> -#include <mach/common.h> #include <mach/mx28.h> #include "clk.h" @@ -244,7 +243,5 @@ int __init mx28_clocks_init(void) for (i = 0; i < ARRAY_SIZE(clks_init_on); i++) clk_prepare_enable(clks[clks_init_on[i]]); - mxs_timer_init(); - return 0; } |