diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-08-27 08:50:00 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:30 -0400 |
commit | 4d9d18a560a50920691865c1efdad6577616eaa9 (patch) | |
tree | dfb227ebc0ae6899d3da8593239fbf47be70e1b0 /arch/arm/mach-imx/mach-imx6sl.c | |
parent | 26cae166cff9148cd2cab40f64ed548ba1189a8e (diff) |
ARM: imx: remove custom .init_time hook
With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx6sl.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx6sl.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c index 0d75dc54f715..c70bd7c64974 100644 --- a/arch/arm/mach-imx/mach-imx6sl.c +++ b/arch/arm/mach-imx/mach-imx6sl.c | |||
@@ -7,7 +7,6 @@ | |||
7 | * | 7 | * |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/clk-provider.h> | ||
11 | #include <linux/irqchip.h> | 10 | #include <linux/irqchip.h> |
12 | #include <linux/of.h> | 11 | #include <linux/of.h> |
13 | #include <linux/of_platform.h> | 12 | #include <linux/of_platform.h> |
@@ -31,11 +30,6 @@ static void __init imx6sl_init_irq(void) | |||
31 | irqchip_init(); | 30 | irqchip_init(); |
32 | } | 31 | } |
33 | 32 | ||
34 | static void __init imx6sl_timer_init(void) | ||
35 | { | ||
36 | of_clk_init(NULL); | ||
37 | } | ||
38 | |||
39 | static const char *imx6sl_dt_compat[] __initdata = { | 33 | static const char *imx6sl_dt_compat[] __initdata = { |
40 | "fsl,imx6sl", | 34 | "fsl,imx6sl", |
41 | NULL, | 35 | NULL, |
@@ -44,7 +38,6 @@ static const char *imx6sl_dt_compat[] __initdata = { | |||
44 | DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)") | 38 | DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)") |
45 | .map_io = debug_ll_io_init, | 39 | .map_io = debug_ll_io_init, |
46 | .init_irq = imx6sl_init_irq, | 40 | .init_irq = imx6sl_init_irq, |
47 | .init_time = imx6sl_timer_init, | ||
48 | .init_machine = imx6sl_init_machine, | 41 | .init_machine = imx6sl_init_machine, |
49 | .dt_compat = imx6sl_dt_compat, | 42 | .dt_compat = imx6sl_dt_compat, |
50 | .restart = mxc_restart, | 43 | .restart = mxc_restart, |