diff options
Diffstat (limited to 'arch/powerpc/platforms/85xx/p5040_ds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/p5040_ds.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/85xx/p5040_ds.c b/arch/powerpc/platforms/85xx/p5040_ds.c index 1138185..095806a 100644 --- a/arch/powerpc/platforms/85xx/p5040_ds.c +++ b/arch/powerpc/platforms/85xx/p5040_ds.c @@ -3,8 +3,8 @@ * * Copyright 2009-2010 Freescale Semiconductor Inc. * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. */ @@ -30,9 +30,6 @@ static int __init p5040_ds_probe(void) { unsigned long root = of_get_flat_dt_root(); -#ifdef CONFIG_SMP - extern struct smp_ops_t smp_85xx_ops; -#endif if (of_flat_dt_is_compatible(root, "fsl,P5040DS")) return 1; @@ -44,14 +41,6 @@ static int __init p5040_ds_probe(void) ppc_md.restart = fsl_hv_restart; ppc_md.power_off = fsl_hv_halt; ppc_md.halt = fsl_hv_halt; -#ifdef CONFIG_SMP - /* - * Disable the timebase sync operations because we can't write - * to the timebase registers under the hypervisor. - */ - smp_85xx_ops.give_timebase = NULL; - smp_85xx_ops.take_timebase = NULL; -#endif return 1; } @@ -80,6 +69,7 @@ define_machine(p5040_ds) { #else .power_save = e500_idle, #endif + .init_early = corenet_ds_init_early, }; machine_arch_initcall(p5040_ds, corenet_ds_publish_devices); |