ARM: vexpress: Remove non-DT code
Now, with the CLCD DT support available, there is no more reason to keep the non-DT support for V2P-CA9. Removed, together with "some" supporting code. It was necessary to make PLAT_VERSATILE_SCHED_CLOCK optional and selected by the machines still interested in it. Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:

committed by
Arnd Bergmann

parent
ad77b79125
commit
81cc3f868d
@@ -19,48 +19,10 @@
|
||||
#include <asm/smp_scu.h>
|
||||
#include <asm/mach/map.h>
|
||||
|
||||
#include <mach/motherboard.h>
|
||||
|
||||
#include <plat/platsmp.h>
|
||||
|
||||
#include "core.h"
|
||||
|
||||
/*
|
||||
* Initialise the CPU possible map early - this describes the CPUs
|
||||
* which may be present or become present in the system.
|
||||
*/
|
||||
static void __init vexpress_smp_init_cpus(void)
|
||||
{
|
||||
ct_desc->init_cpu_map();
|
||||
}
|
||||
|
||||
static void __init vexpress_smp_prepare_cpus(unsigned int max_cpus)
|
||||
{
|
||||
/*
|
||||
* Initialise the present map, which describes the set of CPUs
|
||||
* actually populated at the present time.
|
||||
*/
|
||||
ct_desc->smp_enable(max_cpus);
|
||||
|
||||
/*
|
||||
* Write the address of secondary startup into the
|
||||
* system-wide flags register. The boot monitor waits
|
||||
* until it receives a soft interrupt, and then the
|
||||
* secondary CPU branches to this address.
|
||||
*/
|
||||
vexpress_flags_set(virt_to_phys(versatile_secondary_startup));
|
||||
}
|
||||
|
||||
struct smp_operations __initdata vexpress_smp_ops = {
|
||||
.smp_init_cpus = vexpress_smp_init_cpus,
|
||||
.smp_prepare_cpus = vexpress_smp_prepare_cpus,
|
||||
.smp_secondary_init = versatile_secondary_init,
|
||||
.smp_boot_secondary = versatile_boot_secondary,
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
.cpu_die = vexpress_cpu_die,
|
||||
#endif
|
||||
};
|
||||
|
||||
bool __init vexpress_smp_init_ops(void)
|
||||
{
|
||||
#ifdef CONFIG_MCPM
|
||||
@@ -79,8 +41,6 @@ bool __init vexpress_smp_init_ops(void)
|
||||
return false;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_OF)
|
||||
|
||||
static const struct of_device_id vexpress_smp_dt_scu_match[] __initconst = {
|
||||
{ .compatible = "arm,cortex-a5-scu", },
|
||||
{ .compatible = "arm,cortex-a9-scu", },
|
||||
@@ -112,5 +72,3 @@ struct smp_operations __initdata vexpress_smp_dt_ops = {
|
||||
.cpu_die = vexpress_cpu_die,
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user