diff options
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc832x_rdb.c')
-rw-r--r-- | arch/powerpc/platforms/83xx/mpc832x_rdb.c | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index 17f99745f0e4..ebfecec958d7 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c | |||
@@ -236,35 +236,6 @@ static int __init mpc832x_declare_of_platform_devices(void) | |||
236 | } | 236 | } |
237 | machine_device_initcall(mpc832x_rdb, mpc832x_declare_of_platform_devices); | 237 | machine_device_initcall(mpc832x_rdb, mpc832x_declare_of_platform_devices); |
238 | 238 | ||
239 | static void __init mpc832x_rdb_init_IRQ(void) | ||
240 | { | ||
241 | |||
242 | struct device_node *np; | ||
243 | |||
244 | np = of_find_node_by_type(NULL, "ipic"); | ||
245 | if (!np) | ||
246 | return; | ||
247 | |||
248 | ipic_init(np, 0); | ||
249 | |||
250 | /* Initialize the default interrupt mapping priorities, | ||
251 | * in case the boot rom changed something on us. | ||
252 | */ | ||
253 | ipic_set_default_priority(); | ||
254 | of_node_put(np); | ||
255 | |||
256 | #ifdef CONFIG_QUICC_ENGINE | ||
257 | np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic"); | ||
258 | if (!np) { | ||
259 | np = of_find_node_by_type(NULL, "qeic"); | ||
260 | if (!np) | ||
261 | return; | ||
262 | } | ||
263 | qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); | ||
264 | of_node_put(np); | ||
265 | #endif /* CONFIG_QUICC_ENGINE */ | ||
266 | } | ||
267 | |||
268 | /* | 239 | /* |
269 | * Called very early, MMU is off, device-tree isn't unflattened | 240 | * Called very early, MMU is off, device-tree isn't unflattened |
270 | */ | 241 | */ |
@@ -279,7 +250,7 @@ define_machine(mpc832x_rdb) { | |||
279 | .name = "MPC832x RDB", | 250 | .name = "MPC832x RDB", |
280 | .probe = mpc832x_rdb_probe, | 251 | .probe = mpc832x_rdb_probe, |
281 | .setup_arch = mpc832x_rdb_setup_arch, | 252 | .setup_arch = mpc832x_rdb_setup_arch, |
282 | .init_IRQ = mpc832x_rdb_init_IRQ, | 253 | .init_IRQ = mpc83xx_ipic_and_qe_init_IRQ, |
283 | .get_irq = ipic_get_irq, | 254 | .get_irq = ipic_get_irq, |
284 | .restart = mpc83xx_restart, | 255 | .restart = mpc83xx_restart, |
285 | .time_init = mpc83xx_time_init, | 256 | .time_init = mpc83xx_time_init, |