redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

powerpc/85xx: Additional consolidate of_platform_bus_probe calls

Browse source 
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>
This commit is contained in:
Kumar Gala 2011-11-24 01:00:10 -06:00
parent 46d026ac10
commit 199bfbe6f5
4 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/powerpc/platforms/85xx/mpc85xx_common.c
View file

@ -20,6 +20,7 @@ static struct of_device_id __initdata mpc85xx_common_ids[] = {
{ .compatible = "gianfar", },
{ .compatible = "fsl,qe", },
{ .compatible = "fsl,cpm2", },
{ .compatible = "fsl,srio", },
{},
};

1
arch/powerpc/platforms/85xx/mpc85xx_mds.c
View file

@ -411,7 +411,6 @@ machine_arch_initcall(mpc8568_mds, board_fixups);
machine_arch_initcall(mpc8569_mds, board_fixups);
static struct of_device_id mpc85xx_ids[] = {
{ .compatible = "fsl,srio", },
{ .compatible = "fsl,mpc8548-guts", },
{ .compatible = "gpio-leds", },
{},

15
arch/powerpc/platforms/85xx/p1010rdb.c
View file

@ -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);
/*

19
arch/powerpc/platforms/85xx/p1023_rds.c
View file

@ -34,6 +34,8 @@
#include <sysdev/fsl_soc.h>
#include <sysdev/fsl_pci.h>
#include "mpc85xx.h"
/* ************************************************************************
*
* Setup the architecture
@ -92,22 +94,7 @@ static void __init mpc85xx_rds_setup_arch(void)
#endif
}
static struct of_device_id p1023_ids[] = {
{ .type = "soc", },
{ .compatible = "soc", },
{ .compatible = "simple-bus", },
{},
};
static int __init p1023_publish_devices(void)
{
of_platform_bus_probe(NULL, p1023_ids, NULL);
return 0;
}
machine_device_initcall(p1023_rds, p1023_publish_devices);
machine_device_initcall(p1023_rds, mpc85xx_common_publish_devices);
static void __init mpc85xx_rds_pic_init(void)
{