summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/platsmp.c
diff options
context:
space:
mode:
authorScott Williams <scwilliams@nvidia.com>2011-08-23 14:23:18 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:48:31 -0800
commit0963b9265afa0854cd4c6a24d20e661ed4c8ba88 (patch)
tree1c5829db3a7aea9f9f13b77255a5e3a595542e75 /arch/arm/mach-tegra/platsmp.c
parent451ef25cf77c68982cc8085218da472cea2a4f25 (diff)
ARM: tegra: Use CONFIG_TERGA_CLUSTER_CONTROL for cluster control
Change-Id: I07c389092132e52e2bdd3deab22c10f8e1e6035c Signed-off-by: Scott Williams <scwilliams@nvidia.com> Reviewed-on: http://git-master/r/48798 Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Rebase-Id: R1e0c9acc87c81f9d0dc394c09d6a7b8b94c48d3f
Diffstat (limited to 'arch/arm/mach-tegra/platsmp.c')
-rw-r--r--arch/arm/mach-tegra/platsmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 4a5df914ea88..7ea3f2843831 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -78,9 +78,7 @@ static unsigned int available_cpus(void)
static int is_g_cluster_available(unsigned int cpu)
{
-#ifdef CONFIG_ARCH_TEGRA_2x_SOC
- return -EPERM;
-#else
+#ifdef CONFIG_TEGRA_CLUSTER_CONTROL
u32 fuse_sku = readl(FUSE_SKU_DIRECT_CONFIG);
u32 bond_out = readl(CAR_BOND_OUT_V);
@@ -96,6 +94,8 @@ static int is_g_cluster_available(unsigned int cpu)
* (e.g., low battery, over temperature, etc.). Add checks for
* these conditions. */
return 0;
+#else
+ return -EPERM;
#endif
}