aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2015-04-27 21:19:02 -0400
committerShawn Guo <shawn.guo@linaro.org>2015-06-03 02:44:33 -0400
commitde8e434d09f253369621e994da1833703c5c51d6 (patch)
tree9fef4bbd34c78167086b2c7f57b8eaea7a979a1d
parentcf20968a78c8cc8c1c06f6693a0059d27548656e (diff)
ARM: imx: drop epit timer initialization from imx35 clock driver
EPIT provides another timer implementation besides the default GPT timer. The imx35 clock driver will use EPIT timer when option CONFIG_MXC_USE_EPIT is enabled. However, initializing timers from clock driver is a workaround solution and causes problem when we move clock drivers into driver/clk. Let's simply drop the EPIT initialization from there. If people really want this EPIT option, EPIT timer driver needs to be reworked to do the initialization in a standard way - use CLOCKSOURCE_OF_DECLARE() with device tree support. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--drivers/clk/imx/clk-imx35.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index 133fda1dcb25..f2f3b8164f7b 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -293,11 +293,7 @@ int __init mx35_clocks_init(void)
293 293
294 imx_print_silicon_rev("i.MX35", mx35_revision()); 294 imx_print_silicon_rev("i.MX35", mx35_revision());
295 295
296#ifdef CONFIG_MXC_USE_EPIT
297 epit_timer_init(MX35_IO_ADDRESS(MX35_EPIT1_BASE_ADDR), MX35_INT_EPIT1);
298#else
299 mxc_timer_init(MX35_GPT1_BASE_ADDR, MX35_INT_GPT); 296 mxc_timer_init(MX35_GPT1_BASE_ADDR, MX35_INT_GPT);
300#endif
301 297
302 return 0; 298 return 0;
303} 299}