diff options
Diffstat (limited to 'arch/arm/mach-spear13xx/spear13xx.c')
-rw-r--r-- | arch/arm/mach-spear13xx/spear13xx.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c index c4af775a8451..c7d2b4a8d8cc 100644 --- a/arch/arm/mach-spear13xx/spear13xx.c +++ b/arch/arm/mach-spear13xx/spear13xx.c | |||
@@ -17,9 +17,8 @@ | |||
17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
18 | #include <linux/dw_dmac.h> | 18 | #include <linux/dw_dmac.h> |
19 | #include <linux/err.h> | 19 | #include <linux/err.h> |
20 | #include <linux/of_irq.h> | 20 | #include <linux/of.h> |
21 | #include <asm/hardware/cache-l2x0.h> | 21 | #include <asm/hardware/cache-l2x0.h> |
22 | #include <asm/hardware/gic.h> | ||
23 | #include <asm/mach/map.h> | 22 | #include <asm/mach/map.h> |
24 | #include <asm/smp_twd.h> | 23 | #include <asm/smp_twd.h> |
25 | #include <mach/dma.h> | 24 | #include <mach/dma.h> |
@@ -153,7 +152,7 @@ static void __init spear13xx_clk_init(void) | |||
153 | pr_err("%s: Unknown machine\n", __func__); | 152 | pr_err("%s: Unknown machine\n", __func__); |
154 | } | 153 | } |
155 | 154 | ||
156 | static void __init spear13xx_timer_init(void) | 155 | void __init spear13xx_timer_init(void) |
157 | { | 156 | { |
158 | char pclk_name[] = "osc_24m_clk"; | 157 | char pclk_name[] = "osc_24m_clk"; |
159 | struct clk *gpt_clk, *pclk; | 158 | struct clk *gpt_clk, *pclk; |
@@ -182,17 +181,3 @@ static void __init spear13xx_timer_init(void) | |||
182 | spear_setup_of_timer(); | 181 | spear_setup_of_timer(); |
183 | twd_local_timer_of_register(); | 182 | twd_local_timer_of_register(); |
184 | } | 183 | } |
185 | |||
186 | struct sys_timer spear13xx_timer = { | ||
187 | .init = spear13xx_timer_init, | ||
188 | }; | ||
189 | |||
190 | static const struct of_device_id gic_of_match[] __initconst = { | ||
191 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init }, | ||
192 | { /* Sentinel */ } | ||
193 | }; | ||
194 | |||
195 | void __init spear13xx_dt_init_irq(void) | ||
196 | { | ||
197 | of_irq_init(gic_of_match); | ||
198 | } | ||