summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2011-06-24 21:06:22 -0700
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:47:17 -0800
commit670228736790f88e72d49d20975d27c14d008254 (patch)
treeb680d7bc5925acfa32746cfd034237525e3d8bfd /arch/arm/mach-tegra
parent1af45b5412cafcd3f68a6efff8df744def8ea1cd (diff)
ARM: tegra: power: Restore cpufreq governor target
Restored cpufreq governor target frequency on exit from suspend. Otherwise, CPU would stay at frequency set underneath the governor by tegra driver on suspend entry. Original-Change-Id: Iad96c7771bf89b78cdeb3e8f4e2c40b36e845b57 Reviewed-on: http://git-master/r/38390 Reviewed-by: Alex Courbot <acourbot@nvidia.com> Tested-by: Alex Courbot <acourbot@nvidia.com> Reviewed-by: Scott Williams <scwilliams@nvidia.com> Reviewed-by: Narendra Damahe <ndamahe@nvidia.com> Reviewed-by: Jin Qian <jqian@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com> Rebase-Id: R12135cc7f8f940eac1653432786826bf2affec16
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r--arch/arm/mach-tegra/cpu-tegra.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c
index d032205e1146..1eb1a29b2f58 100644
--- a/arch/arm/mach-tegra/cpu-tegra.c
+++ b/arch/arm/mach-tegra/cpu-tegra.c
@@ -500,8 +500,12 @@ static int tegra_pm_notify(struct notifier_block *nb, unsigned long event,
tegra_auto_hotplug_governor(
freq_table[suspend_index].frequency, true);
} else if (event == PM_POST_SUSPEND) {
+ unsigned int freq;
is_suspended = false;
tegra_cpu_edp_init(true);
+ tegra_cpu_cap_highest_speed(&freq);
+ pr_info("Tegra cpufreq resume: restoring frequency to %d kHz\n",
+ freq);
}
mutex_unlock(&tegra_cpu_lock);