aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-hisi
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@linaro.org>2013-12-19 21:52:57 -0500
committerKevin Hilman <khilman@linaro.org>2013-12-20 11:23:01 -0500
commit52a45100f0cada7f003e6fa3f426244b18846ba5 (patch)
treed57a89f27011bae4c9abbb25388d5b4b80174493 /arch/arm/mach-hisi
parent389ee0c2ffedf5819dccc2c67dd15757c4550765 (diff)
ARM: hisi: remove init_time
Since init_time in machine descriptor is already covered by arch/arm/kernel/time.c by default. We needn't to append it any more. Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-hisi')
-rw-r--r--arch/arm/mach-hisi/hisilicon.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-hisi/hisilicon.c b/arch/arm/mach-hisi/hisilicon.c
index 685d9ebd612d..741faf3e7100 100644
--- a/arch/arm/mach-hisi/hisilicon.c
+++ b/arch/arm/mach-hisi/hisilicon.c
@@ -51,12 +51,6 @@ static void __init hi3620_map_io(void)
51 iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc)); 51 iotable_init(hi3620_io_desc, ARRAY_SIZE(hi3620_io_desc));
52} 52}
53 53
54static void __init hi3xxx_timer_init(void)
55{
56 of_clk_init(NULL);
57 clocksource_of_init();
58}
59
60static void hi3xxx_restart(enum reboot_mode mode, const char *cmd) 54static void hi3xxx_restart(enum reboot_mode mode, const char *cmd)
61{ 55{
62 struct device_node *np; 56 struct device_node *np;
@@ -90,7 +84,6 @@ static const char *hi3xxx_compat[] __initconst = {
90 84
91DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)") 85DT_MACHINE_START(HI3620, "Hisilicon Hi3620 (Flattened Device Tree)")
92 .map_io = hi3620_map_io, 86 .map_io = hi3620_map_io,
93 .init_time = hi3xxx_timer_init,
94 .dt_compat = hi3xxx_compat, 87 .dt_compat = hi3xxx_compat,
95 .smp = smp_ops(hi3xxx_smp_ops), 88 .smp = smp_ops(hi3xxx_smp_ops),
96 .restart = hi3xxx_restart, 89 .restart = hi3xxx_restart,