iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: sti: remove custom .init_time hook

Browse Source 
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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
This commit is contained in:
Sebastian Hesselbarth 2013-08-27 15:23:07 +02:00
parent dc8105817f
commit 28fbb151d5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-sti/board-dt.c
View File

@ -7,9 +7,8 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/clk-provider.h>
#include <linux/clocksource.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/of_platform.h>
#include <asm/hardware/cache-l2x0.h> #include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.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); 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(); stih41x_l2x0_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
static const char *stih41x_dt_match[] __initdata = { 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") 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), .smp = smp_ops(sti_smp_ops),
.dt_compat = stih41x_dt_match, .dt_compat = stih41x_dt_match,
MACHINE_END MACHINE_END