diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-06 09:11:01 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:45 -0400 |
commit | b39e0249830a1b88cc213d1e9d3d1ca1f40df3b8 (patch) | |
tree | a1c3abe55c3a696c7ba104801cde0ada3fceb68d | |
parent | 28fbb151d5afe15a2fabfe2fe8585b610b022f5b (diff) |
ARM: sunxi: 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: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index e5a69756427b..90dda6228510 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c | |||
@@ -10,7 +10,6 @@ | |||
10 | * warranty of any kind, whether express or implied. | 10 | * warranty of any kind, whether express or implied. |
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include <linux/clocksource.h> | ||
14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
@@ -114,12 +113,6 @@ static void sunxi_setup_restart(void) | |||
114 | arm_pm_restart = of_id->data; | 113 | arm_pm_restart = of_id->data; |
115 | } | 114 | } |
116 | 115 | ||
117 | static void __init sunxi_timer_init(void) | ||
118 | { | ||
119 | of_clk_init(NULL); | ||
120 | clocksource_of_init(); | ||
121 | } | ||
122 | |||
123 | static void __init sunxi_dt_init(void) | 116 | static void __init sunxi_dt_init(void) |
124 | { | 117 | { |
125 | sunxi_setup_restart(); | 118 | sunxi_setup_restart(); |
@@ -138,6 +131,5 @@ static const char * const sunxi_board_dt_compat[] = { | |||
138 | 131 | ||
139 | DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") | 132 | DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") |
140 | .init_machine = sunxi_dt_init, | 133 | .init_machine = sunxi_dt_init, |
141 | .init_time = sunxi_timer_init, | ||
142 | .dt_compat = sunxi_board_dt_compat, | 134 | .dt_compat = sunxi_board_dt_compat, |
143 | MACHINE_END | 135 | MACHINE_END |