diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-04 08:23:55 -0400 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-09-29 15:09:38 -0400 |
commit | 50432501fc6fabd57e86b968f0a4d5099e074c6f (patch) | |
tree | 425f17f747009861a5744410874ba0781a3f83ab /arch/arm/mach-prima2 | |
parent | 638085eea1cb218bc9267d8629fb1982e1ff7c3b (diff) |
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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Barry Song <baohua.song@csr.com>
Diffstat (limited to 'arch/arm/mach-prima2')
-rw-r--r-- | arch/arm/mach-prima2/common.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index 9b7663d9096f..d49aff74de98 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c | |||
@@ -6,8 +6,6 @@ | |||
6 | * Licensed under GPLv2 or later. | 6 | * Licensed under GPLv2 or later. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/clk-provider.h> | ||
10 | #include <linux/clocksource.h> | ||
11 | #include <linux/init.h> | 9 | #include <linux/init.h> |
12 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
13 | #include <asm/sizes.h> | 11 | #include <asm/sizes.h> |
@@ -22,12 +20,6 @@ void __init sirfsoc_init_late(void) | |||
22 | sirfsoc_pm_init(); | 20 | sirfsoc_pm_init(); |
23 | } | 21 | } |
24 | 22 | ||
25 | static __init void sirfsoc_init_time(void) | ||
26 | { | ||
27 | of_clk_init(NULL); | ||
28 | clocksource_of_init(); | ||
29 | } | ||
30 | |||
31 | static __init void sirfsoc_map_io(void) | 23 | static __init void sirfsoc_map_io(void) |
32 | { | 24 | { |
33 | sirfsoc_map_lluart(); | 25 | sirfsoc_map_lluart(); |
@@ -43,7 +35,6 @@ static const char *atlas6_dt_match[] __initdata = { | |||
43 | DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") | 35 | DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") |
44 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 36 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
45 | .map_io = sirfsoc_map_io, | 37 | .map_io = sirfsoc_map_io, |
46 | .init_time = sirfsoc_init_time, | ||
47 | .init_late = sirfsoc_init_late, | 38 | .init_late = sirfsoc_init_late, |
48 | .dt_compat = atlas6_dt_match, | 39 | .dt_compat = atlas6_dt_match, |
49 | .restart = sirfsoc_restart, | 40 | .restart = sirfsoc_restart, |
@@ -59,7 +50,6 @@ static const char *prima2_dt_match[] __initdata = { | |||
59 | DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") | 50 | DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") |
60 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 51 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
61 | .map_io = sirfsoc_map_io, | 52 | .map_io = sirfsoc_map_io, |
62 | .init_time = sirfsoc_init_time, | ||
63 | .dma_zone_size = SZ_256M, | 53 | .dma_zone_size = SZ_256M, |
64 | .init_late = sirfsoc_init_late, | 54 | .init_late = sirfsoc_init_late, |
65 | .dt_compat = prima2_dt_match, | 55 | .dt_compat = prima2_dt_match, |
@@ -77,7 +67,6 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)") | |||
77 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 67 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
78 | .smp = smp_ops(sirfsoc_smp_ops), | 68 | .smp = smp_ops(sirfsoc_smp_ops), |
79 | .map_io = sirfsoc_map_io, | 69 | .map_io = sirfsoc_map_io, |
80 | .init_time = sirfsoc_init_time, | ||
81 | .init_late = sirfsoc_init_late, | 70 | .init_late = sirfsoc_init_late, |
82 | .dt_compat = marco_dt_match, | 71 | .dt_compat = marco_dt_match, |
83 | .restart = sirfsoc_restart, | 72 | .restart = sirfsoc_restart, |