summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/tegra3_actmon.c
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2012-03-12 12:01:17 -0700
committerSimone Willett <swillett@nvidia.com>2012-03-20 14:03:11 -0700
commit5c777fb62d43755401f66771548154f94a570aa8 (patch)
tree2c17e8da76844066a886e064c8c4b1b42a3e653d /arch/arm/mach-tegra/tegra3_actmon.c
parentb309bc41bd5e461bbd2064cf90d77e55bf18cdaa (diff)
ARM: tegra: clock: Fix activity monitor resume
Properly restore Tegra3 actmon sampling period after suspend. Bug 952739 Signed-off-by: Alex Frid <afrid@nvidia.com> (cherry picked from commit eb6e96a39dbc5d310e8e59046d6e1b787b780e60) Change-Id: I6a61c2aa1d384a8d17d7ef579000cf59ac218435 Reviewed-on: http://git-master/r/90804 Tested-by: Aleksandr Frid <afrid@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra3_actmon.c')
-rw-r--r--arch/arm/mach-tegra/tegra3_actmon.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra3_actmon.c b/arch/arm/mach-tegra/tegra3_actmon.c
index c7aeb9acdd12..43130f960ecd 100644
--- a/arch/arm/mach-tegra/tegra3_actmon.c
+++ b/arch/arm/mach-tegra/tegra3_actmon.c
@@ -551,6 +551,8 @@ static int actmon_pm_notify(struct notifier_block *nb,
actmon_dev_suspend(actmon_devices[i]);
break;
case PM_POST_SUSPEND:
+ actmon_writel(actmon_sampling_period - 1,
+ ACTMON_GLB_PERIOD_CTRL);
for (i = 0; i < ARRAY_SIZE(actmon_devices); i++)
actmon_dev_resume(actmon_devices[i]);
break;