diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-04 13:09:21 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:35 -0400 |
commit | e70ded64e6e08d7d35932b4a66a791480edfc0d1 (patch) | |
tree | 16e59676590742a69a1a32dabdfb9ec9132972de /arch/arm/mach-nomadik | |
parent | dd03ee9ae5bc080297175c921b1a693d0de1e8b0 (diff) |
ARM: nomadik: 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: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-nomadik')
-rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 2be38a00a3d9..53fbf63c8b66 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
28 | #include <linux/clk-provider.h> | ||
29 | #include <linux/clocksource.h> | ||
30 | #include <linux/of_irq.h> | 28 | #include <linux/of_irq.h> |
31 | #include <linux/of_gpio.h> | 29 | #include <linux/of_gpio.h> |
32 | #include <linux/of_address.h> | 30 | #include <linux/of_address.h> |
@@ -113,12 +111,6 @@ static void cpu8815_restart(enum reboot_mode mode, const char *cmd) | |||
113 | writel(1, srcbase + 0x18); | 111 | writel(1, srcbase + 0x18); |
114 | } | 112 | } |
115 | 113 | ||
116 | static void __init cpu8815_timer_init_of(void) | ||
117 | { | ||
118 | of_clk_init(NULL); | ||
119 | clocksource_of_init(); | ||
120 | } | ||
121 | |||
122 | static struct fsmc_nand_timings cpu8815_nand_timings = { | 114 | static struct fsmc_nand_timings cpu8815_nand_timings = { |
123 | .thiz = 0, | 115 | .thiz = 0, |
124 | .thold = 0x10, | 116 | .thold = 0x10, |
@@ -232,7 +224,6 @@ static const char * cpu8815_board_compat[] = { | |||
232 | 224 | ||
233 | DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815") | 225 | DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815") |
234 | .map_io = cpu8815_map_io, | 226 | .map_io = cpu8815_map_io, |
235 | .init_time = cpu8815_timer_init_of, | ||
236 | .init_machine = cpu8815_init_of, | 227 | .init_machine = cpu8815_init_of, |
237 | .restart = cpu8815_restart, | 228 | .restart = cpu8815_restart, |
238 | .dt_compat = cpu8815_board_compat, | 229 | .dt_compat = cpu8815_board_compat, |