[PATCH 20/26] ARM: rockchip: remove custom .init_time hook

[Heiko Stübner]

Am Mittwoch, 18. September 2013, 19:53:53 schrieb Sebastian Hesselbarth:
> 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 at gmail.com>

Acked-by: Heiko Stuebner <heiko at sntech.de>


> ---
> Cc: Olof Johansson <olof at lixom.net>
> Cc: Arnd Bergmann <arnd at arndb.de>
> Cc: Russell King <linux at arm.linux.org.uk>
> Cc: Heiko Stuebner <heiko at sntech.de>
> Cc: linux-arm-kernel at lists.infradead.org
> Cc: linux-kernel at vger.kernel.org
> ---
>  arch/arm/mach-rockchip/rockchip.c |    9 ---------
>  1 file changed, 9 deletions(-)
> 
> diff --git a/arch/arm/mach-rockchip/rockchip.c
> b/arch/arm/mach-rockchip/rockchip.c index 724d2d8..82c0b07 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