diff options
| author | Alex Frid <afrid@nvidia.com> | 2011-07-13 12:56:13 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:47:40 -0800 |
| commit | 88005901b316fbfdcb8c1d5383a436ba7819f838 (patch) | |
| tree | 8fbcccaf8f3fddda29ac958d2e1ad9e000342888 /arch/arm/mach-tegra/pm-t3.c | |
| parent | 5c8fa3cf806d51709493a5c9e5b2cd77dbba12be (diff) | |
ARM: tegra: power: Don't use suspended kernel time
Do not use kernel time to time-stamp Tegra3 CPU ULP/G mode switch in
late suspend/early resume when timekeeping is suspended.
Original-Change-Id: Idb6c8f8c2dd2cfc1e00cec53392de12131d6bbe1
Reviewed-on: http://git-master/r/40958
Tested-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Narendra Damahe <ndamahe@nvidia.com>
Reviewed-by: Chih-Lung Huang <lhuang@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Rebase-Id: R6ce7a5e7e06949f3536524ea675aa9c0fc2ab097
Diffstat (limited to 'arch/arm/mach-tegra/pm-t3.c')
| -rw-r--r-- | arch/arm/mach-tegra/pm-t3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/pm-t3.c b/arch/arm/mach-tegra/pm-t3.c index 26ca45d6ec94..c8fa1f2ceecc 100644 --- a/arch/arm/mach-tegra/pm-t3.c +++ b/arch/arm/mach-tegra/pm-t3.c @@ -305,7 +305,7 @@ int tegra_cluster_control(unsigned int us, unsigned int flags) if (flags & TEGRA_POWER_CLUSTER_IMMEDIATE) us = 0; - if (current_cluster != target_cluster) { + if ((current_cluster != target_cluster) && (!timekeeping_suspended)) { if (target_cluster == TEGRA_POWER_CLUSTER_G) { s64 t = ktime_to_us(ktime_sub(ktime_get(), last_g2lp)); s64 t_off = tegra_cpu_power_off_time(); |