diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-08-27 09:19:46 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:40 -0400 |
commit | 2ab38d9343416f0de93bfeafbd2470fcc994f8ab (patch) | |
tree | 0e855afceb299afc451253daa48a624e2d578ec2 | |
parent | 50432501fc6fabd57e86b968f0a4d5099e074c6f (diff) |
ARM: rockchip: 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: Heiko Stuebner <heiko@sntech.de>
-rw-r--r-- | arch/arm/mach-rockchip/rockchip.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index 724d2d81f976..82c0b0709712 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c | |||
@@ -19,18 +19,10 @@ | |||
19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
20 | #include <linux/of_platform.h> | 20 | #include <linux/of_platform.h> |
21 | #include <linux/irqchip.h> | 21 | #include <linux/irqchip.h> |
22 | #include <linux/dw_apb_timer.h> | ||
23 | #include <linux/clk-provider.h> | ||
24 | #include <asm/mach/arch.h> | 22 | #include <asm/mach/arch.h> |
25 | #include <asm/mach/map.h> | 23 | #include <asm/mach/map.h> |
26 | #include <asm/hardware/cache-l2x0.h> | 24 | #include <asm/hardware/cache-l2x0.h> |
27 | 25 | ||
28 | static void __init rockchip_timer_init(void) | ||
29 | { | ||
30 | of_clk_init(NULL); | ||
31 | clocksource_of_init(); | ||
32 | } | ||
33 | |||
34 | static void __init rockchip_dt_init(void) | 26 | static void __init rockchip_dt_init(void) |
35 | { | 27 | { |
36 | l2x0_of_init(0, ~0UL); | 28 | l2x0_of_init(0, ~0UL); |
@@ -47,6 +39,5 @@ static const char * const rockchip_board_dt_compat[] = { | |||
47 | 39 | ||
48 | DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)") | 40 | DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)") |
49 | .init_machine = rockchip_dt_init, | 41 | .init_machine = rockchip_dt_init, |
50 | .init_time = rockchip_timer_init, | ||
51 | .dt_compat = rockchip_board_dt_compat, | 42 | .dt_compat = rockchip_board_dt_compat, |
52 | MACHINE_END | 43 | MACHINE_END |