diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-11-17 12:56:17 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2011-11-24 03:01:41 -0500 |
commit | 46d026ac1029daa89dd3bf8a3b458fdaab0a3893 (patch) | |
tree | eaaef690800400178534868069ff289e908ff9dc /arch/powerpc/platforms/85xx/mpc85xx_ads.c | |
parent | 543a07b17389d751dbe2683d34e79be7c10ab6ac (diff) |
powerpc/85xx: consolidate of_platform_bus_probe calls
85xx board files have a lot of duplication in *_publish_devices()/
*_declare_of_platform_devices() functions. Merge that into a single
function common to most of the boards.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/mpc85xx_ads.c')
-rw-r--r-- | arch/powerpc/platforms/85xx/mpc85xx_ads.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c index 8b8f7a201166..986554b74d3f 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c | |||
@@ -193,23 +193,7 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m) | |||
193 | seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); | 193 | seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); |
194 | } | 194 | } |
195 | 195 | ||
196 | static struct of_device_id __initdata of_bus_ids[] = { | 196 | machine_device_initcall(mpc85xx_ads, mpc85xx_common_publish_devices); |
197 | { .name = "soc", }, | ||
198 | { .type = "soc", }, | ||
199 | { .name = "cpm", }, | ||
200 | { .name = "localbus", }, | ||
201 | { .compatible = "simple-bus", }, | ||
202 | { .compatible = "gianfar", }, | ||
203 | {}, | ||
204 | }; | ||
205 | |||
206 | static int __init declare_of_platform_devices(void) | ||
207 | { | ||
208 | of_platform_bus_probe(NULL, of_bus_ids, NULL); | ||
209 | |||
210 | return 0; | ||
211 | } | ||
212 | machine_device_initcall(mpc85xx_ads, declare_of_platform_devices); | ||
213 | 197 | ||
214 | /* | 198 | /* |
215 | * Called very early, device-tree isn't unflattened | 199 | * Called very early, device-tree isn't unflattened |