diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-04 08:12:46 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:49 -0400 |
commit | 64cc69abbb32e17aa44d2c696eca65cb6f9364ca (patch) | |
tree | cf1f85a1a833376f8078724ee62cfe6835e0201d | |
parent | 56e89cf55c47288f906bd769cb3d6d4736db548a (diff) |
ARM: vt8500: 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: Tony Prisk <linux@prisktech.co.nz>
-rw-r--r-- | arch/arm/mach-vt8500/vt8500.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index 504156351b3e..4a73464cb11b 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c | |||
@@ -18,8 +18,6 @@ | |||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/clk-provider.h> | ||
22 | #include <linux/clocksource.h> | ||
23 | #include <linux/io.h> | 21 | #include <linux/io.h> |
24 | #include <linux/pm.h> | 22 | #include <linux/pm.h> |
25 | #include <linux/reboot.h> | 23 | #include <linux/reboot.h> |
@@ -74,12 +72,6 @@ static void vt8500_power_off(void) | |||
74 | asm("mcr%? p15, 0, %0, c7, c0, 4" : : "r" (0)); | 72 | asm("mcr%? p15, 0, %0, c7, c0, 4" : : "r" (0)); |
75 | } | 73 | } |
76 | 74 | ||
77 | static void __init vt8500_init_time(void) | ||
78 | { | ||
79 | of_clk_init(NULL); | ||
80 | clocksource_of_init(); | ||
81 | } | ||
82 | |||
83 | void __init vt8500_init(void) | 75 | void __init vt8500_init(void) |
84 | { | 76 | { |
85 | struct device_node *np; | 77 | struct device_node *np; |
@@ -183,7 +175,6 @@ DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") | |||
183 | .dt_compat = vt8500_dt_compat, | 175 | .dt_compat = vt8500_dt_compat, |
184 | .map_io = vt8500_map_io, | 176 | .map_io = vt8500_map_io, |
185 | .init_machine = vt8500_init, | 177 | .init_machine = vt8500_init, |
186 | .init_time = vt8500_init_time, | ||
187 | .restart = vt8500_restart, | 178 | .restart = vt8500_restart, |
188 | MACHINE_END | 179 | MACHINE_END |
189 | 180 | ||