Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28fbb151 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

ARM: sti: remove custom .init_time hook 



With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks. To get rid of it, move l2cc init to
.init_machine hook instead.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@st.com>
parent dc810581

arch/arm/mach-sti/board-dt.c

+4 −6
Original line number Diff line number Diff line
@@ -7,9 +7,8 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/irq.h>

#include <linux/of_platform.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/arch.h>
@@ -28,11 +27,10 @@ void __init stih41x_l2x0_init(void) 
	l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK);

}



static void __init stih41x_timer_init(void)

static void __init stih41x_machine_init(void)

{

	of_clk_init(NULL);

	clocksource_of_init();

	stih41x_l2x0_init();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char *stih41x_dt_match[] __initdata = {
@@ -42,7 +40,7 @@ static const char *stih41x_dt_match[] __initdata = { 
};



DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree")

	.init_time	= stih41x_timer_init,

	.init_machine	= stih41x_machine_init,

	.smp		= smp_ops(sti_smp_ops),

	.dt_compat	= stih41x_dt_match,

MACHINE_END