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

Commit 50432501 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth
Browse files

ARM: prima2: remove custom .init_time hook 



With arch/arm calling of_clk_init(NULL) from time_init(), we can now
remove custom .init_time hooks.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarBarry Song <baohua.song@csr.com>
parent 638085ee

arch/arm/mach-prima2/common.c

+0 −11
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
 * Licensed under GPLv2 or later.

 */



#include <linux/clk-provider.h>

#include <linux/clocksource.h>

#include <linux/init.h>

#include <linux/kernel.h>

#include <asm/sizes.h>
@@ -22,12 +20,6 @@ void __init sirfsoc_init_late(void) 
	sirfsoc_pm_init();

}



static __init void sirfsoc_init_time(void)

{

	of_clk_init(NULL);

	clocksource_of_init();

}



static __init void sirfsoc_map_io(void)

{

	sirfsoc_map_lluart();
@@ -43,7 +35,6 @@ static const char *atlas6_dt_match[] __initdata = { 
DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.map_io         = sirfsoc_map_io,

	.init_time	= sirfsoc_init_time,

	.init_late	= sirfsoc_init_late,

	.dt_compat      = atlas6_dt_match,

	.restart	= sirfsoc_restart,
@@ -59,7 +50,6 @@ static const char *prima2_dt_match[] __initdata = { 
DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")

	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.map_io         = sirfsoc_map_io,

	.init_time	= sirfsoc_init_time,

	.dma_zone_size	= SZ_256M,

	.init_late	= sirfsoc_init_late,

	.dt_compat      = prima2_dt_match,
@@ -77,7 +67,6 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") 
	/* Maintainer: Barry Song <baohua.song@csr.com> */

	.smp            = smp_ops(sirfsoc_smp_ops),

	.map_io         = sirfsoc_map_io,

	.init_time	= sirfsoc_init_time,

	.init_late	= sirfsoc_init_late,

	.dt_compat      = marco_dt_match,

	.restart	= sirfsoc_restart,