diff options
Diffstat (limited to 'arch/arm/mach-prima2')
-rw-r--r-- | arch/arm/mach-prima2/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-prima2/common.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-prima2/timer.c | 8 |
3 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c index f25a54194639..ed3570e5eb8f 100644 --- a/arch/arm/mach-prima2/common.c +++ b/arch/arm/mach-prima2/common.c | |||
@@ -40,7 +40,7 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") | |||
40 | /* Maintainer: Barry Song <baohua.song@csr.com> */ | 40 | /* Maintainer: Barry Song <baohua.song@csr.com> */ |
41 | .map_io = sirfsoc_map_lluart, | 41 | .map_io = sirfsoc_map_lluart, |
42 | .init_irq = sirfsoc_of_irq_init, | 42 | .init_irq = sirfsoc_of_irq_init, |
43 | .timer = &sirfsoc_timer, | 43 | .init_time = sirfsoc_timer_init, |
44 | .dma_zone_size = SZ_256M, | 44 | .dma_zone_size = SZ_256M, |
45 | .init_machine = sirfsoc_mach_init, | 45 | .init_machine = sirfsoc_mach_init, |
46 | .init_late = sirfsoc_init_late, | 46 | .init_late = sirfsoc_init_late, |
diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h index 60d826fc2185..9c75f124e3cf 100644 --- a/arch/arm/mach-prima2/common.h +++ b/arch/arm/mach-prima2/common.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <asm/mach/time.h> | 13 | #include <asm/mach/time.h> |
14 | 14 | ||
15 | extern struct sys_timer sirfsoc_timer; | 15 | extern void sirfsoc_timer_init(void); |
16 | 16 | ||
17 | extern void __init sirfsoc_of_irq_init(void); | 17 | extern void __init sirfsoc_of_irq_init(void); |
18 | extern void __init sirfsoc_of_clk_init(void); | 18 | extern void __init sirfsoc_of_clk_init(void); |
diff --git a/arch/arm/mach-prima2/timer.c b/arch/arm/mach-prima2/timer.c index 4f69e678e83c..a7a2c199c3ea 100644 --- a/arch/arm/mach-prima2/timer.c +++ b/arch/arm/mach-prima2/timer.c | |||
@@ -181,7 +181,7 @@ static void __init sirfsoc_clockevent_init(void) | |||
181 | } | 181 | } |
182 | 182 | ||
183 | /* initialize the kernel jiffy timer source */ | 183 | /* initialize the kernel jiffy timer source */ |
184 | static void __init sirfsoc_timer_init(void) | 184 | void __init sirfsoc_timer_init(void) |
185 | { | 185 | { |
186 | unsigned long rate; | 186 | unsigned long rate; |
187 | struct clk *clk; | 187 | struct clk *clk; |
@@ -220,7 +220,7 @@ static struct of_device_id timer_ids[] = { | |||
220 | {}, | 220 | {}, |
221 | }; | 221 | }; |
222 | 222 | ||
223 | static void __init sirfsoc_of_timer_map(void) | 223 | void __init sirfsoc_of_timer_map(void) |
224 | { | 224 | { |
225 | struct device_node *np; | 225 | struct device_node *np; |
226 | const unsigned int *intspec; | 226 | const unsigned int *intspec; |
@@ -239,7 +239,3 @@ static void __init sirfsoc_of_timer_map(void) | |||
239 | 239 | ||
240 | of_node_put(np); | 240 | of_node_put(np); |
241 | } | 241 | } |
242 | |||
243 | struct sys_timer sirfsoc_timer = { | ||
244 | .init = sirfsoc_timer_init, | ||
245 | }; | ||