diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-08-27 15:19:46 +0200 |
|---|---|---|
| committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 21:09:40 +0200 |
| commit | 2ab38d9343416f0de93bfeafbd2470fcc994f8ab (patch) | |
| tree | 0e855afceb299afc451253daa48a624e2d578ec2 /arch/arm/mach-rockchip/rockchip.c | |
| parent | ARM: prima2: remove custom .init_time hook (diff) | |
| download | linux-2ab38d9343416f0de93bfeafbd2470fcc994f8ab.tar.xz linux-2ab38d9343416f0de93bfeafbd2470fcc994f8ab.zip | |
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>
Diffstat (limited to 'arch/arm/mach-rockchip/rockchip.c')
| -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 @@ #include <linux/init.h> #include <linux/of_platform.h> #include <linux/irqchip.h> -#include <linux/dw_apb_timer.h> -#include <linux/clk-provider.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> #include <asm/hardware/cache-l2x0.h> -static void __init rockchip_timer_init(void) -{ - of_clk_init(NULL); - clocksource_of_init(); -} - static void __init rockchip_dt_init(void) { l2x0_of_init(0, ~0UL); @@ -47,6 +39,5 @@ static const char * const rockchip_board_dt_compat[] = { DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)") .init_machine = rockchip_dt_init, - .init_time = rockchip_timer_init, .dt_compat = rockchip_board_dt_compat, MACHINE_END |