summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx/sbc8548.c
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov2011-11-17 18:56:17 +0100
committerKumar Gala2011-11-24 09:01:41 +0100
commit46d026ac1029daa89dd3bf8a3b458fdaab0a3893 (patch)
treeeaaef690800400178534868069ff289e908ff9dc /arch/powerpc/platforms/85xx/sbc8548.c
parentpowerpc/85xx: separate cpm2 pic init (diff)
downloadkernel-qcow2-linux-46d026ac1029daa89dd3bf8a3b458fdaab0a3893.tar.gz
kernel-qcow2-linux-46d026ac1029daa89dd3bf8a3b458fdaab0a3893.tar.xz
kernel-qcow2-linux-46d026ac1029daa89dd3bf8a3b458fdaab0a3893.zip
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/sbc8548.c')
-rw-r--r--arch/powerpc/platforms/85xx/sbc8548.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/arch/powerpc/platforms/85xx/sbc8548.c b/arch/powerpc/platforms/85xx/sbc8548.c
index 14632a971225..845ed3b89462 100644
--- a/arch/powerpc/platforms/85xx/sbc8548.c
+++ b/arch/powerpc/platforms/85xx/sbc8548.c
@@ -48,6 +48,8 @@
#include <sysdev/fsl_soc.h>
#include <sysdev/fsl_pci.h>
+#include "mpc85xx.h"
+
static int sbc_rev;
static void __init sbc8548_pic_init(void)
@@ -149,21 +151,7 @@ static void sbc8548_show_cpuinfo(struct seq_file *m)
seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
}
-static struct of_device_id __initdata of_bus_ids[] = {
- { .name = "soc", },
- { .type = "soc", },
- { .compatible = "simple-bus", },
- { .compatible = "gianfar", },
- {},
-};
-
-static int __init declare_of_platform_devices(void)
-{
- of_platform_bus_probe(NULL, of_bus_ids, NULL);
-
- return 0;
-}
-machine_device_initcall(sbc8548, declare_of_platform_devices);
+machine_device_initcall(sbc8548, mpc85xx_common_publish_devices);
/*
* Called very early, device-tree isn't unflattened