ARM: dts: list the CPU nodes for EXYNOS5250

Instead of having to specify the number for CPUs in EXYNOS5250 in
platsmp.c file, let the number of CPUs be determined by having this
information listed in EXYNOS5250 device tree file.

Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 1e215fed037bb9c2d0ec640638eac3224fe2e0f9..d04ab0ad791ada51e951a84e8c992270c2c9fcd0 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -52,6 +52,22 @@
                pinctrl3 = &pinctrl_3;
        };
 
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               cpu@0 {
+                       device_type = "cpu";
+                       compatible = "arm,cortex-a15";
+                       reg = <0>;
+               };
+               cpu@1 {
+                       device_type = "cpu";
+                       compatible = "arm,cortex-a15";
+                       reg = <1>;
+               };
+       };
+
        pd_gsc: gsc-power-domain@0x10044000 {
                compatible = "samsung,exynos4210-pd";
                reg = <0x10044000 0x20>;

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index a0e8ff7758a4c055e16323364167cfeb8fcfe2ab..ab1d2d5f37098532612292e757fac9af4ec3d547 100644 (file)
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -180,10 +180,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) {