summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-08-21 18:10:55 +0100
committerJon Medhurst <tixy@linaro.org>2012-08-23 14:17:30 +0100
commit9257f8e571d15bdfb33680e330b934d4f6a2d7eb (patch)
treee1c77411eed1ac4408491e6835083b3f0ce7bf58
parenta62bf07fde0ad1156c74398fbe3d8a38874b70f5 (diff)
Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rw-r--r--arch/arm/mach-vexpress/cpuidle-tc2.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/cpuidle-tc2.c b/arch/arm/mach-vexpress/cpuidle-tc2.c
index 09c0f23acefa..0abc5afbfefb 100644
--- a/arch/arm/mach-vexpress/cpuidle-tc2.c
+++ b/arch/arm/mach-vexpress/cpuidle-tc2.c
@@ -72,7 +72,6 @@ static struct cpuidle_state tc2_cpuidle_set[] __initdata = {
CPUIDLE_FLAG_COUPLED,
.name = "C1",
.desc = "ARM power down",
- .disabled = 1,
},
};
@@ -279,6 +278,15 @@ int __init tc2_idle_init(void)
vexpress_spc_set_wake_intr(0x7ff);
v2m_flags_set(virt_to_phys(tc2_cpu_resume));
+ /*
+ * Enable idle by default for all possible clusters.
+ * This must be done after all other setup to prevent the
+ * possibility of clusters being powered down before they
+ * are fully configured.
+ */
+ for (i = 0; i < NR_CLUSTERS; i++)
+ cpumask_set_cpu(i, &cluster_mask);
+
return 0;
}