diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2012-01-25 01:35:57 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-14 05:35:15 -0400 |
commit | e9bba61522a7650b0e4d9952bb3ece81d473a52c (patch) | |
tree | 7619168da722aaecb9a43837298a161b7f164e79 /arch/arm/mach-exynos/platsmp.c | |
parent | 330c90a54c82596dfe355163c4d888e51a0fe65b (diff) |
ARM: EXYNOS: add support get_core_count() for EXYNOS5250
The EXYNOS5250 has two Cortex-A15 cores and there's no
need to call scu_enable() in platform_smp_prepare_cpus()
because Cortex-A15 has no regarding scu register which
can be used for getting number of cores.
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos/platsmp.c')
-rw-r--r-- | arch/arm/mach-exynos/platsmp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 0f2035a1eb6e..36c3984aaa47 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c | |||
@@ -166,7 +166,10 @@ void __init smp_init_cpus(void) | |||
166 | void __iomem *scu_base = scu_base_addr(); | 166 | void __iomem *scu_base = scu_base_addr(); |
167 | unsigned int i, ncores; | 167 | unsigned int i, ncores; |
168 | 168 | ||
169 | ncores = scu_base ? scu_get_core_count(scu_base) : 1; | 169 | if (soc_is_exynos5250()) |
170 | ncores = 2; | ||
171 | else | ||
172 | ncores = scu_base ? scu_get_core_count(scu_base) : 1; | ||
170 | 173 | ||
171 | /* sanity check */ | 174 | /* sanity check */ |
172 | if (ncores > nr_cpu_ids) { | 175 | if (ncores > nr_cpu_ids) { |
@@ -183,8 +186,8 @@ void __init smp_init_cpus(void) | |||
183 | 186 | ||
184 | void __init platform_smp_prepare_cpus(unsigned int max_cpus) | 187 | void __init platform_smp_prepare_cpus(unsigned int max_cpus) |
185 | { | 188 | { |
186 | 189 | if (!soc_is_exynos5250()) | |
187 | scu_enable(scu_base_addr()); | 190 | scu_enable(scu_base_addr()); |
188 | 191 | ||
189 | /* | 192 | /* |
190 | * Write the address of secondary startup into the | 193 | * Write the address of secondary startup into the |