Revert "[HACK] soc: samsung: Fixed cluster id when hotplug in/out."

This reverts commit 85b083cc30a41b12e7b66fd1ef0e681be58931a4.

Change-Id: Ie06d4f0a6a7eb15c81c62c3d0dc34be979213581

diff --git a/drivers/soc/samsung/exynos-cpupm.c b/drivers/soc/samsung/exynos-cpupm.c
index 9f95823674f8a368023a602010ca3f2998fb3411..f1f7c98112f60542daf9ea0b9e198a01ca46391a 100644 (file)
--- a/drivers/soc/samsung/exynos-cpupm.c
+++ b/drivers/soc/samsung/exynos-cpupm.c
@@ -74,9 +74,7 @@ static int check_idle_ip(int reg_index)
                 *--------------------------- (XOR)
                 *            0 0 0 0 0 1 0 0
                 */
-#ifdef CONFIG_ARM64_EXYNOS_CPUIDLE
                cpuidle_profile_idle_ip(reg_index, ((val & ~mask) ^ ~mask));
-#endif
        }
 
        return ret;
@@ -301,7 +299,7 @@ static int cpuhp_cpupm_online(unsigned int cpu)
 
        cpumask_and(&mask, cpu_coregroup_mask(cpu), cpu_online_mask);
        if (cpumask_weight(&mask) == 0)
-               cluster_enable(1);
+               cluster_enable(cpu);
 
        cpu_enable(cpu);
 
@@ -316,7 +314,7 @@ static int cpuhp_cpupm_offline(unsigned int cpu)
 
        cpumask_and(&mask, cpu_coregroup_mask(cpu), cpu_online_mask);
        if (cpumask_weight(&mask) == 0)
-               cluster_disable(1);
+               cluster_disable(cpu);
 
        return 0;
 }
@@ -608,18 +606,14 @@ static int try_to_enter_power_mode(int cpu, struct power_mode *mode)
        dbg_snapshot_cpuidle(mode->name, 0, 0, DSS_FLAG_IN);
        set_state_powerdown(mode);
 
-#ifdef CONFIG_ARM64_EXYNOS_CPUIDLE
        cpuidle_profile_group_idle_enter(mode->id);
-#endif
 
        return 1;
 }
 
 static void exit_mode(int cpu, struct power_mode *mode, int cancel)
 {
-#ifdef CONFIG_ARM64_EXYNOS_CPUIDLE
        cpuidle_profile_group_idle_exit(mode->id, cancel);
-#endif
 
        /*
         * Configure settings to exit power mode. This is executed by the
@@ -856,9 +850,8 @@ static int __init cpu_power_mode_init(void)
                /* Connect power mode to the cpus in the power domain */
                for_each_cpu(cpu, &mode->siblings)
                        add_mode(per_cpu(cpupm, cpu).modes, mode);
-#ifdef CONFIG_ARM64_EXYNOS_CPUIDLE
+
                cpuidle_profile_group_idle_register(mode->id, mode->name);
-#endif
        }
 
        if (attr_count)