diff options
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-omap2/common.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/irq.c | 5 |
3 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 0b311d51425f..495305903401 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -52,8 +52,6 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") | |||
52 | .reserve = omap_reserve, | 52 | .reserve = omap_reserve, |
53 | .map_io = omap242x_map_io, | 53 | .map_io = omap242x_map_io, |
54 | .init_early = omap2420_init_early, | 54 | .init_early = omap2420_init_early, |
55 | .init_irq = omap_intc_of_init, | ||
56 | .handle_irq = omap2_intc_handle_irq, | ||
57 | .init_machine = omap_generic_init, | 55 | .init_machine = omap_generic_init, |
58 | .init_time = omap2_sync32k_timer_init, | 56 | .init_time = omap2_sync32k_timer_init, |
59 | .dt_compat = omap242x_boards_compat, | 57 | .dt_compat = omap242x_boards_compat, |
@@ -71,8 +69,6 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") | |||
71 | .reserve = omap_reserve, | 69 | .reserve = omap_reserve, |
72 | .map_io = omap243x_map_io, | 70 | .map_io = omap243x_map_io, |
73 | .init_early = omap2430_init_early, | 71 | .init_early = omap2430_init_early, |
74 | .init_irq = omap_intc_of_init, | ||
75 | .handle_irq = omap2_intc_handle_irq, | ||
76 | .init_machine = omap_generic_init, | 72 | .init_machine = omap_generic_init, |
77 | .init_time = omap2_sync32k_timer_init, | 73 | .init_time = omap2_sync32k_timer_init, |
78 | .dt_compat = omap243x_boards_compat, | 74 | .dt_compat = omap243x_boards_compat, |
@@ -91,8 +87,6 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") | |||
91 | .reserve = omap_reserve, | 87 | .reserve = omap_reserve, |
92 | .map_io = omap3_map_io, | 88 | .map_io = omap3_map_io, |
93 | .init_early = omap3430_init_early, | 89 | .init_early = omap3430_init_early, |
94 | .init_irq = omap_intc_of_init, | ||
95 | .handle_irq = omap3_intc_handle_irq, | ||
96 | .init_machine = omap_generic_init, | 90 | .init_machine = omap_generic_init, |
97 | .init_late = omap3_init_late, | 91 | .init_late = omap3_init_late, |
98 | .init_time = omap3_sync32k_timer_init, | 92 | .init_time = omap3_sync32k_timer_init, |
@@ -109,8 +103,6 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") | |||
109 | .reserve = omap_reserve, | 103 | .reserve = omap_reserve, |
110 | .map_io = omap3_map_io, | 104 | .map_io = omap3_map_io, |
111 | .init_early = omap3630_init_early, | 105 | .init_early = omap3630_init_early, |
112 | .init_irq = omap_intc_of_init, | ||
113 | .handle_irq = omap3_intc_handle_irq, | ||
114 | .init_machine = omap_generic_init, | 106 | .init_machine = omap_generic_init, |
115 | .init_late = omap3_init_late, | 107 | .init_late = omap3_init_late, |
116 | .init_time = omap3_sync32k_timer_init, | 108 | .init_time = omap3_sync32k_timer_init, |
@@ -128,8 +120,6 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") | |||
128 | .reserve = omap_reserve, | 120 | .reserve = omap_reserve, |
129 | .map_io = omap3_map_io, | 121 | .map_io = omap3_map_io, |
130 | .init_early = omap3430_init_early, | 122 | .init_early = omap3430_init_early, |
131 | .init_irq = omap_intc_of_init, | ||
132 | .handle_irq = omap3_intc_handle_irq, | ||
133 | .init_machine = omap_generic_init, | 123 | .init_machine = omap_generic_init, |
134 | .init_late = omap3_init_late, | 124 | .init_late = omap3_init_late, |
135 | .init_time = omap3_secure_sync32k_timer_init, | 125 | .init_time = omap3_secure_sync32k_timer_init, |
@@ -146,8 +136,6 @@ DT_MACHINE_START(AM3517_DT, "Generic AM3517 (Flattened Device Tree)") | |||
146 | .reserve = omap_reserve, | 136 | .reserve = omap_reserve, |
147 | .map_io = omap3_map_io, | 137 | .map_io = omap3_map_io, |
148 | .init_early = am35xx_init_early, | 138 | .init_early = am35xx_init_early, |
149 | .init_irq = omap_intc_of_init, | ||
150 | .handle_irq = omap3_intc_handle_irq, | ||
151 | .init_machine = omap_generic_init, | 139 | .init_machine = omap_generic_init, |
152 | .init_late = omap3_init_late, | 140 | .init_late = omap3_init_late, |
153 | .init_time = omap3_gptimer_timer_init, | 141 | .init_time = omap3_gptimer_timer_init, |
@@ -166,8 +154,6 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)") | |||
166 | .reserve = omap_reserve, | 154 | .reserve = omap_reserve, |
167 | .map_io = am33xx_map_io, | 155 | .map_io = am33xx_map_io, |
168 | .init_early = am33xx_init_early, | 156 | .init_early = am33xx_init_early, |
169 | .init_irq = omap_intc_of_init, | ||
170 | .handle_irq = omap3_intc_handle_irq, | ||
171 | .init_machine = omap_generic_init, | 157 | .init_machine = omap_generic_init, |
172 | .init_late = am33xx_init_late, | 158 | .init_late = am33xx_init_late, |
173 | .init_time = omap3_gptimer_timer_init, | 159 | .init_time = omap3_gptimer_timer_init, |
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 34ab9ee9ee43..ed906bcca133 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h | |||
@@ -221,7 +221,6 @@ void omap3_intc_prepare_idle(void); | |||
221 | void omap3_intc_resume_idle(void); | 221 | void omap3_intc_resume_idle(void); |
222 | void omap2_intc_handle_irq(struct pt_regs *regs); | 222 | void omap2_intc_handle_irq(struct pt_regs *regs); |
223 | void omap3_intc_handle_irq(struct pt_regs *regs); | 223 | void omap3_intc_handle_irq(struct pt_regs *regs); |
224 | void omap_intc_of_init(void); | ||
225 | void omap_gic_of_init(void); | 224 | void omap_gic_of_init(void); |
226 | 225 | ||
227 | #ifdef CONFIG_CACHE_L2X0 | 226 | #ifdef CONFIG_CACHE_L2X0 |
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 280124371c07..465d7257056a 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c | |||
@@ -322,11 +322,6 @@ static int __init intc_of_init(struct device_node *node, | |||
322 | 322 | ||
323 | IRQCHIP_DECLARE(omap_intc, "ti,omap2-intc", intc_of_init); | 323 | IRQCHIP_DECLARE(omap_intc, "ti,omap2-intc", intc_of_init); |
324 | 324 | ||
325 | void __init omap_intc_of_init(void) | ||
326 | { | ||
327 | of_irq_init(&irqchip_of_match_omap_intc); | ||
328 | } | ||
329 | |||
330 | asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs) | 325 | asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs) |
331 | { | 326 | { |
332 | omap_intc_handle_irq(regs); | 327 | omap_intc_handle_irq(regs); |