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

Commit 56e89cf5 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

ARM: vexpress: remove custom .init_time hook 



With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks. The call to versatile_sched_clock_init
is moved to .init_early instead, were it is also for non-DT boards.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarJon Medhurst (Tixy) <tixy@linaro.org>
Acked-by: default avatarPawel Moll <pawel.moll@arm.com>
parent 41136b66

arch/arm/mach-vexpress/v2m.c

+1 −13
Original line number Diff line number Diff line 
/*

 * Versatile Express V2M Motherboard Support

 */

#include <linux/clocksource.h>

#include <linux/device.h>

#include <linux/amba/bus.h>

#include <linux/amba/mmci.h>

#include <linux/io.h>

#include <linux/clocksource.h>

#include <linux/smp.h>

#include <linux/init.h>

#include <linux/of_address.h>
@@ -22,7 +20,6 @@ 
#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/vexpress.h>

#include <linux/clk-provider.h>

#include <linux/clkdev.h>



#include <asm/mach-types.h>
@@ -422,16 +419,8 @@ void __init v2m_dt_init_early(void) 
			pr_warning("vexpress: DT HBI (%x) is not matching "

					"hardware (%x)!\n", dt_hbi, hbi);

	}

}



static void __init v2m_dt_timer_init(void)

{

	of_clk_init(NULL);



	clocksource_of_init();



	versatile_sched_clock_init(vexpress_get_24mhz_clock_base(),

				24000000);

	versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), 24000000);

}



static const struct of_device_id v2m_dt_bus_match[] __initconst = {
@@ -458,6 +447,5 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express") 
	.smp_init	= smp_init_ops(vexpress_smp_init_ops),

	.map_io		= v2m_dt_map_io,

	.init_early	= v2m_dt_init_early,

	.init_time	= v2m_dt_timer_init,

	.init_machine	= v2m_dt_init,

MACHINE_END