diff options
author | Dmitry Osipenko <digetx@gmail.com> | 2020-02-25 01:40:55 +0300 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2020-03-13 11:32:01 +0100 |
commit | 382ac8e22b90e6334d373da03c17b319458b258e (patch) | |
tree | 03fde6acd400a581f1289d008c78f25c5ebfda1a /drivers/cpuidle | |
parent | 14e086baca509ef244715ad8b6c3f7bf80621e0b (diff) | |
download | linux-stable-382ac8e22b90e6334d373da03c17b319458b258e.tar.gz linux-stable-382ac8e22b90e6334d373da03c17b319458b258e.tar.bz2 linux-stable-382ac8e22b90e6334d373da03c17b319458b258e.zip |
cpuidle: tegra: Disable CC6 state if LP2 unavailable
LP2 suspending could be unavailable, for example if it is disabled in a
device-tree. CC6 cpuidle state won't work in that case.
Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/cpuidle')
-rw-r--r-- | drivers/cpuidle/cpuidle-tegra.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/cpuidle/cpuidle-tegra.c b/drivers/cpuidle/cpuidle-tegra.c index 2ddbd289e17d..313b0290e97b 100644 --- a/drivers/cpuidle/cpuidle-tegra.c +++ b/drivers/cpuidle/cpuidle-tegra.c @@ -31,6 +31,7 @@ #include <soc/tegra/fuse.h> #include <soc/tegra/irq.h> #include <soc/tegra/pm.h> +#include <soc/tegra/pmc.h> #include <asm/cpuidle.h> #include <asm/firmware.h> @@ -337,6 +338,10 @@ static void tegra_cpuidle_setup_tegra114_c7_state(void) static int tegra_cpuidle_probe(struct platform_device *pdev) { + /* LP2 could be disabled in device-tree */ + if (tegra_pmc_get_suspend_mode() < TEGRA_SUSPEND_LP2) + tegra_cpuidle_disable_state(TEGRA_CC6); + /* * Required suspend-resume functionality, which is provided by the * Tegra-arch core and PMC driver, is unavailable if PM-sleep option |