diff options
| author | Thierry Reding <treding@nvidia.com> | 2015-02-23 15:24:11 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2015-08-13 16:51:28 +0200 |
| commit | fc0cf1773434c153a831067a29935e4627803583 (patch) | |
| tree | 46adff56f8082122ce49562ec2cf2aded80f64dc /arch/arm/mach-tegra | |
| parent | 592431b0369dc7a1f4a68f15ff0c48d94b66297f (diff) | |
| download | linux-fc0cf1773434c153a831067a29935e4627803583.tar.bz2 | |
ARM: tegra: Disable cpuidle if PSCI is available
This is only relevant on Tegra114 and Tegra124, because earlier Tegra
generations used Cortex-A9 without secure extensions.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/cpuidle-tegra114.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c index 155807fa6fdd..bc00dd4a6fb2 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra114.c +++ b/arch/arm/mach-tegra/cpuidle-tegra114.c @@ -24,6 +24,7 @@ #include <asm/cpuidle.h> #include <asm/smp_plat.h> #include <asm/suspend.h> +#include <asm/psci.h> #include "pm.h" #include "sleep.h" @@ -84,5 +85,8 @@ static struct cpuidle_driver tegra_idle_driver = { int __init tegra114_cpuidle_init(void) { - return cpuidle_register(&tegra_idle_driver, NULL); + if (!psci_smp_available()) + return cpuidle_register(&tegra_idle_driver, NULL); + + return 0; } |