diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-25 15:25:39 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-25 15:25:39 +1100 |
| commit | 56368797d6c2d093bb0e7a7e5fe7b267274b6c58 (patch) | |
| tree | fc74d34be3628d31e50d3987dd372b73dd50c352 /arch/powerpc/platforms/85xx/xes_mpc85xx.c | |
| parent | e075cd7001634c9984950488d9201fcf896dca27 (diff) | |
| parent | 8e18862d52b8ecd62354dad117aff22391b2c4e5 (diff) | |
| download | blackbird-obmc-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.gz blackbird-obmc-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx/xes_mpc85xx.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/xes_mpc85xx.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c index a9dc5e795123..4632c1b27da7 100644 --- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c +++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c @@ -33,6 +33,8 @@ #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> +#include "mpc85xx.h" + /* A few bit definitions needed for fixups on some boards */ #define MPC85xx_L2CTL_L2E 0x80000000 /* L2 enable */ #define MPC85xx_L2CTL_L2I 0x40000000 /* L2 flash invalidate */ @@ -177,21 +179,9 @@ static void __init xes_mpc85xx_setup_arch(void) #endif } -static struct of_device_id __initdata xes_mpc85xx_ids[] = { - { .type = "soc", }, - { .compatible = "soc", }, - { .compatible = "simple-bus", }, - { .compatible = "gianfar", }, - {}, -}; - -static int __init xes_mpc85xx_publish_devices(void) -{ - return of_platform_bus_probe(NULL, xes_mpc85xx_ids, NULL); -} -machine_device_initcall(xes_mpc8572, xes_mpc85xx_publish_devices); -machine_device_initcall(xes_mpc8548, xes_mpc85xx_publish_devices); -machine_device_initcall(xes_mpc8540, xes_mpc85xx_publish_devices); +machine_device_initcall(xes_mpc8572, mpc85xx_common_publish_devices); +machine_device_initcall(xes_mpc8548, mpc85xx_common_publish_devices); +machine_device_initcall(xes_mpc8540, mpc85xx_common_publish_devices); /* * Called very early, device-tree isn't unflattened |
