]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: imx: drop epit timer initialization from imx35 clock driver
authorShawn Guo <shawn.guo@linaro.org>
Tue, 28 Apr 2015 01:19:02 +0000 (09:19 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Wed, 3 Jun 2015 06:44:33 +0000 (14:44 +0800)
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>
drivers/clk/imx/clk-imx35.c

index 133fda1dcb251f7df9fc9e0bffd2255eebdf9f35..f2f3b8164f7b5b2b88d131354a5139dc15e8caa1 100644 (file)
@@ -293,11 +293,7 @@ int __init mx35_clocks_init(void)
 
        imx_print_silicon_rev("i.MX35", mx35_revision());
 
-#ifdef CONFIG_MXC_USE_EPIT
-       epit_timer_init(MX35_IO_ADDRESS(MX35_EPIT1_BASE_ADDR), MX35_INT_EPIT1);
-#else
        mxc_timer_init(MX35_GPT1_BASE_ADDR, MX35_INT_GPT);
-#endif
 
        return 0;
 }