diff options
Diffstat (limited to 'arch/powerpc/platforms/83xx/asp834x.c')
-rw-r--r-- | arch/powerpc/platforms/83xx/asp834x.c | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c index aa0d84d22585..464ea8e0292d 100644 --- a/arch/powerpc/platforms/83xx/asp834x.c +++ b/arch/powerpc/platforms/83xx/asp834x.c | |||
@@ -36,38 +36,7 @@ static void __init asp834x_setup_arch(void) | |||
36 | mpc834x_usb_cfg(); | 36 | mpc834x_usb_cfg(); |
37 | } | 37 | } |
38 | 38 | ||
39 | static void __init asp834x_init_IRQ(void) | 39 | machine_device_initcall(asp834x, mpc83xx_declare_of_platform_devices); |
40 | { | ||
41 | struct device_node *np; | ||
42 | |||
43 | np = of_find_node_by_type(NULL, "ipic"); | ||
44 | if (!np) | ||
45 | return; | ||
46 | |||
47 | ipic_init(np, 0); | ||
48 | |||
49 | of_node_put(np); | ||
50 | |||
51 | /* Initialize the default interrupt mapping priorities, | ||
52 | * in case the boot rom changed something on us. | ||
53 | */ | ||
54 | ipic_set_default_priority(); | ||
55 | } | ||
56 | |||
57 | static struct __initdata of_device_id asp8347_ids[] = { | ||
58 | { .type = "soc", }, | ||
59 | { .compatible = "soc", }, | ||
60 | { .compatible = "simple-bus", }, | ||
61 | { .compatible = "gianfar", }, | ||
62 | {}, | ||
63 | }; | ||
64 | |||
65 | static int __init asp8347_declare_of_platform_devices(void) | ||
66 | { | ||
67 | of_platform_bus_probe(NULL, asp8347_ids, NULL); | ||
68 | return 0; | ||
69 | } | ||
70 | machine_device_initcall(asp834x, asp8347_declare_of_platform_devices); | ||
71 | 40 | ||
72 | /* | 41 | /* |
73 | * Called very early, MMU is off, device-tree isn't unflattened | 42 | * Called very early, MMU is off, device-tree isn't unflattened |
@@ -82,7 +51,7 @@ define_machine(asp834x) { | |||
82 | .name = "ASP8347E", | 51 | .name = "ASP8347E", |
83 | .probe = asp834x_probe, | 52 | .probe = asp834x_probe, |
84 | .setup_arch = asp834x_setup_arch, | 53 | .setup_arch = asp834x_setup_arch, |
85 | .init_IRQ = asp834x_init_IRQ, | 54 | .init_IRQ = mpc83xx_ipic_init_IRQ, |
86 | .get_irq = ipic_get_irq, | 55 | .get_irq = ipic_get_irq, |
87 | .restart = mpc83xx_restart, | 56 | .restart = mpc83xx_restart, |
88 | .time_init = mpc83xx_time_init, | 57 | .time_init = mpc83xx_time_init, |