diff options
-rw-r--r-- | arch/powerpc/platforms/52xx/lite5200.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_common.c | 7 | ||||
-rw-r--r-- | include/asm-powerpc/mpc52xx.h | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c index eaff71e74fb0..0f21bab33f6c 100644 --- a/arch/powerpc/platforms/52xx/lite5200.c +++ b/arch/powerpc/platforms/52xx/lite5200.c | |||
@@ -153,6 +153,7 @@ define_machine(lite52xx) { | |||
153 | .name = "lite52xx", | 153 | .name = "lite52xx", |
154 | .probe = lite52xx_probe, | 154 | .probe = lite52xx_probe, |
155 | .setup_arch = lite52xx_setup_arch, | 155 | .setup_arch = lite52xx_setup_arch, |
156 | .init = mpc52xx_declare_of_platform_devices, | ||
156 | .init_IRQ = mpc52xx_init_irq, | 157 | .init_IRQ = mpc52xx_init_irq, |
157 | .get_irq = mpc52xx_get_irq, | 158 | .get_irq = mpc52xx_get_irq, |
158 | .show_cpuinfo = lite52xx_show_cpuinfo, | 159 | .show_cpuinfo = lite52xx_show_cpuinfo, |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c index 8331ff457770..cc40889074bd 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_common.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c | |||
@@ -116,11 +116,12 @@ unmap_regs: | |||
116 | if (xlb) iounmap(xlb); | 116 | if (xlb) iounmap(xlb); |
117 | } | 117 | } |
118 | 118 | ||
119 | static int __init | 119 | void __init |
120 | mpc52xx_declare_of_platform_devices(void) | 120 | mpc52xx_declare_of_platform_devices(void) |
121 | { | 121 | { |
122 | /* Find every child of the SOC node and add it to of_platform */ | 122 | /* Find every child of the SOC node and add it to of_platform */ |
123 | return of_platform_bus_probe(NULL, NULL, NULL); | 123 | if (of_platform_bus_probe(NULL, NULL, NULL)) |
124 | printk(KERN_ERR __FILE__ ": " | ||
125 | "Error while probing of_platform bus\n"); | ||
124 | } | 126 | } |
125 | 127 | ||
126 | device_initcall(mpc52xx_declare_of_platform_devices); | ||
diff --git a/include/asm-powerpc/mpc52xx.h b/include/asm-powerpc/mpc52xx.h index 4a28a850998c..4560d72fc758 100644 --- a/include/asm-powerpc/mpc52xx.h +++ b/include/asm-powerpc/mpc52xx.h | |||
@@ -244,6 +244,7 @@ struct mpc52xx_cdm { | |||
244 | extern void __iomem * mpc52xx_find_and_map(const char *); | 244 | extern void __iomem * mpc52xx_find_and_map(const char *); |
245 | extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); | 245 | extern unsigned int mpc52xx_find_ipb_freq(struct device_node *node); |
246 | extern void mpc52xx_setup_cpu(void); | 246 | extern void mpc52xx_setup_cpu(void); |
247 | extern void mpc52xx_declare_of_platform_devices(void); | ||
247 | 248 | ||
248 | extern void mpc52xx_init_irq(void); | 249 | extern void mpc52xx_init_irq(void); |
249 | extern unsigned int mpc52xx_get_irq(void); | 250 | extern unsigned int mpc52xx_get_irq(void); |