Merge tag 'late-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-jammy-kernel.git] / arch / arm / mach-exynos / platsmp.c

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index d9c6d0ab6a0ca62a9f7d8678709d0fa4baf5c4fa..deba1308ff162eddfb76578f3547e96eb16c8120 100644 (file)
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -50,6 +50,8 @@ static inline void __iomem *cpu_boot_reg(int cpu)
        boot_reg = cpu_boot_reg_base();
        if (soc_is_exynos4412())
                boot_reg += 4*cpu;
+       else if (soc_is_exynos5420())
+               boot_reg += 4;
        return boot_reg;
 }
 
@@ -180,10 +182,14 @@ static void __init exynos_smp_init_cpus(void)
        void __iomem *scu_base = scu_base_addr();
        unsigned int i, ncores;
 
-       if (soc_is_exynos5250())
-               ncores = 2;
-       else
+       if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
                ncores = scu_base ? scu_get_core_count(scu_base) : 1;
+       else
+               /*
+                * CPU Nodes are passed thru DT and set_cpu_possible
+                * is set by "arm_dt_init_cpu_maps".
+                */
+               return;
 
        /* sanity check */
        if (ncores > nr_cpu_ids) {