diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 09:10:44 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 09:10:44 -0600 |
| commit | 336c3c2ec7e24bdf01c8f0c311ac7081b1f73d72 (patch) | |
| tree | 516683b63acb2e8c5e7a6541ff2fce3496a33457 /arch/powerpc/platforms/83xx/mpc8360e_pb.c | |
| parent | 6624b35d6250632497c5943faa2ee2a91344d91c (diff) | |
[POWERPC] 83xx: Cleaning up machine probing and board initcalls
Cleaned up the probing functionality to be more consistent across all 83xx
boards and added machine_is() protection around board initcalls to ensure they
only do something if we are actually running on that board.
Additionally, removed some dead code on mpc832x_mds.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/83xx/mpc8360e_pb.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/mpc8360e_pb.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/powerpc/platforms/83xx/mpc8360e_pb.c b/arch/powerpc/platforms/83xx/mpc8360e_pb.c index ccce2f9f283..76fcb5bdb75 100644 --- a/arch/powerpc/platforms/83xx/mpc8360e_pb.c +++ b/arch/powerpc/platforms/83xx/mpc8360e_pb.c @@ -145,6 +145,9 @@ static int __init mpc8360_declare_of_platform_devices(void) { struct device_node *np; + if (!machine_is(mpc8360_sys)) + return 0; + for (np = NULL; (np = of_find_compatible_node(np, "network", "ucc_geth")) != NULL;) { int ucc_num; @@ -194,6 +197,9 @@ static int __init mpc8360_rtc_hookup(void) { struct timespec tv; + if (!machine_is(mpc8360_sys)) + return 0; + ppc_md.get_rtc_time = ds1374_get_rtc_time; ppc_md.set_rtc_time = ds1374_set_rtc_time; @@ -212,16 +218,9 @@ late_initcall(mpc8360_rtc_hookup); */ static int __init mpc8360_sys_probe(void) { - char *model = of_get_flat_dt_prop(of_get_flat_dt_root(), - "model", NULL); - if (model == NULL) - return 0; - if (strcmp(model, "MPC8360EPB")) - return 0; - - DBG("MPC8360EMDS-PB found\n"); + unsigned long root = of_get_flat_dt_root(); - return 1; + return of_flat_dt_is_compatible(root, "MPC836xMDS"); } define_machine(mpc8360_sys) { |