diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-04 07:16:01 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:34 -0400 |
commit | dd03ee9ae5bc080297175c921b1a693d0de1e8b0 (patch) | |
tree | 58692928c92834a86bc51ea1a60f0ae94529eaf0 /arch/arm/mach-mxs/mach-mxs.c | |
parent | a169e3aa37f33ca88131168e46bf23a317de6ace (diff) |
ARM: mxs: remove custom .init_time hook
This patch converts clk-imx2[38] clocksource_of_init compatible init
associated with fsl,imx2[38]-clkctrl. With arch/arm calling
of_clk_init(NULL) from time_init(), we can now also remove custom
.init_time hooks.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
Acked-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 | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 98f6e2adb53e..cc511a4890a3 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c | |||
@@ -13,8 +13,6 @@ | |||
13 | #include <linux/clk.h> | 13 | #include <linux/clk.h> |
14 | #include <linux/clk/mxs.h> | 14 | #include <linux/clk/mxs.h> |
15 | #include <linux/clkdev.h> | 15 | #include <linux/clkdev.h> |
16 | #include <linux/clocksource.h> | ||
17 | #include <linux/clk-provider.h> | ||
18 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
19 | #include <linux/err.h> | 17 | #include <linux/err.h> |
20 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
@@ -490,16 +488,6 @@ static void mxs_restart(enum reboot_mode mode, const char *cmd) | |||
490 | soft_restart(0); | 488 | soft_restart(0); |
491 | } | 489 | } |
492 | 490 | ||
493 | static void __init mxs_timer_init(void) | ||
494 | { | ||
495 | if (of_machine_is_compatible("fsl,imx23")) | ||
496 | mx23_clocks_init(); | ||
497 | else | ||
498 | mx28_clocks_init(); | ||
499 | of_clk_init(NULL); | ||
500 | clocksource_of_init(); | ||
501 | } | ||
502 | |||
503 | static const char *mxs_dt_compat[] __initdata = { | 491 | static const char *mxs_dt_compat[] __initdata = { |
504 | "fsl,imx28", | 492 | "fsl,imx28", |
505 | "fsl,imx23", | 493 | "fsl,imx23", |
@@ -508,7 +496,6 @@ static const char *mxs_dt_compat[] __initdata = { | |||
508 | 496 | ||
509 | DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") | 497 | DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)") |
510 | .handle_irq = icoll_handle_irq, | 498 | .handle_irq = icoll_handle_irq, |
511 | .init_time = mxs_timer_init, | ||
512 | .init_machine = mxs_machine_init, | 499 | .init_machine = mxs_machine_init, |
513 | .init_late = mxs_pm_init, | 500 | .init_late = mxs_pm_init, |
514 | .dt_compat = mxs_dt_compat, | 501 | .dt_compat = mxs_dt_compat, |