diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2013-09-17 19:30:58 +0200 |
|---|---|---|
| committer | Pawel Moll <pawel.moll@arm.com> | 2014-05-15 18:02:21 +0200 |
| commit | d2606f81d5632f873884f1988fb2e9d3f057fcb6 (patch) | |
| tree | e3f10081aad9c8beb7514c9176937f7d0f93d181 /arch/arm/mach-vexpress/v2m.c | |
| parent | ARM: vexpress: remove redundant vexpress_dt_cpus_num to get cpu count (diff) | |
| download | linux-d2606f81d5632f873884f1988fb2e9d3f057fcb6.tar.xz linux-d2606f81d5632f873884f1988fb2e9d3f057fcb6.zip | |
ARM: vexpress: Simplify SMP operations for DT-powered system
As all cores must be properly described in the Device Tree,
there is no point in getting their numbers from SCU on
A5/A9 platforms. This significantly simplifies the code,
removing the need for flat-tree scanning and early static
mapping.
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index d8a9fd7a695d..d8b419bcf3c3 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -400,10 +400,6 @@ void __init v2m_dt_map_io(void) iotable_init(&v2m_rs1_io_desc, 1); else iotable_init(v2m_io_desc, ARRAY_SIZE(v2m_io_desc)); - -#if defined(CONFIG_SMP) - vexpress_dt_smp_map_io(); -#endif } void __init v2m_dt_init_early(void) @@ -434,7 +430,7 @@ static const char * const v2m_dt_match[] __initconst = { DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express") .dt_compat = v2m_dt_match, - .smp = smp_ops(vexpress_smp_ops), + .smp = smp_ops(vexpress_smp_dt_ops), .smp_init = smp_init_ops(vexpress_smp_init_ops), .map_io = v2m_dt_map_io, .init_early = v2m_dt_init_early, |