From: Shawn Guo Date: Tue, 28 Apr 2015 01:19:02 +0000 (+0800) Subject: ARM: imx: drop epit timer initialization from imx35 clock driver X-Git-Tag: firefly_0821_release~176^2~1557^2~8^2~31 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=de8e434d09f253369621e994da1833703c5c51d6;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Shawn Guo --- 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) 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; }