summaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/85xx/p1010rdb.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-11-24 01:00:10 -0600
committerKumar Gala <galak@kernel.crashing.org>2011-11-24 02:01:41 -0600
commit199bfbe6f537f6bc8176228d01326dae7d37ff7f (patch)
tree4dcd9f7ef7cdae69036efe87be6b05666ea84c5b /arch/powerpc/platforms/85xx/p1010rdb.c
parent46d026ac1029daa89dd3bf8a3b458fdaab0a3893 (diff)
powerpc/85xx: Additional consolidate of_platform_bus_probe calls
P1010RDB & P1023RDS can use the new mpc85xx_common_publish_devices(). Also move 'fsl,srio' into the list of standard buses. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx/p1010rdb.c')
-rw-r--r--arch/powerpc/platforms/85xx/p1010rdb.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/85xx/p1010rdb.c b/arch/powerpc/platforms/85xx/p1010rdb.c
index d7387fa7f534..2f479f88c1a0 100644
--- a/arch/powerpc/platforms/85xx/p1010rdb.c
+++ b/arch/powerpc/platforms/85xx/p1010rdb.c
@@ -28,6 +28,8 @@
#include <sysdev/fsl_soc.h>
#include <sysdev/fsl_pci.h>
+#include "mpc85xx.h"
+
void __init p1010_rdb_pic_init(void)
{
struct mpic *mpic;
@@ -81,18 +83,7 @@ static void __init p1010_rdb_setup_arch(void)
printk(KERN_INFO "P1010 RDB board from Freescale Semiconductor\n");
}
-static struct of_device_id __initdata p1010rdb_ids[] = {
- { .type = "soc", },
- { .compatible = "soc", },
- { .compatible = "simple-bus", },
- {},
-};
-
-static int __init p1010rdb_publish_devices(void)
-{
- return of_platform_bus_probe(NULL, p1010rdb_ids, NULL);
-}
-machine_device_initcall(p1010_rdb, p1010rdb_publish_devices);
+machine_device_initcall(p1010_rdb, mpc85xx_common_publish_devices);
machine_arch_initcall(p1010_rdb, swiotlb_setup_bus_notifier);
/*