lkml.org 
[lkml]   [2013]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 15/26] ARM: kirkwood: remove custom .init_time hook
On Wed, Sep 18, 2013 at 07:53:48PM +0200, Sebastian Hesselbarth wrote:
> 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>
> ---
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Russell King <linux@arm.linux.org.uk>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> arch/arm/mach-kirkwood/board-dt.c | 8 --------
> 1 file changed, 8 deletions(-)


Hi Sebastian

Boot tested on a Kirkwood Topkick.

Tested-by: Andrew Lunn <andrew@lunn.ch>

Andrew

>
> diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
> index 82d3ad8..a32a3e5 100644
> --- a/arch/arm/mach-kirkwood/board-dt.c
> +++ b/arch/arm/mach-kirkwood/board-dt.c
> @@ -15,7 +15,6 @@
> #include <linux/of.h>
> #include <linux/of_platform.h>
> #include <linux/clk-provider.h>
> -#include <linux/clocksource.h>
> #include <linux/dma-mapping.h>
> #include <linux/irqchip.h>
> #include <linux/kexec.h>
> @@ -66,12 +65,6 @@ static void __init kirkwood_legacy_clk_init(void)
> clk_prepare_enable(clk);
> }
>
> -static void __init kirkwood_dt_time_init(void)
> -{
> - of_clk_init(NULL);
> - clocksource_of_init();
> -}
> -
> static void __init kirkwood_dt_init_early(void)
> {
> mvebu_mbus_init("marvell,kirkwood-mbus",
> @@ -122,7 +115,6 @@ DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
> /* Maintainer: Jason Cooper <jason@lakedaemon.net> */
> .map_io = kirkwood_map_io,
> .init_early = kirkwood_dt_init_early,
> - .init_time = kirkwood_dt_time_init,
> .init_machine = kirkwood_dt_init,
> .restart = kirkwood_restart,
> .dt_compat = kirkwood_dt_board_compat,
> --
> 1.7.10.4
>


\
 
 \ /
  Last update: 2013-09-21 22:41    [W:0.426 / U:1.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site