From b8af16cc014cf77fa66e931b96e8cc1559ee8acb Mon Sep 17 00:00:00 2001 From: Alex Frid Date: Thu, 12 May 2011 20:20:05 -0700 Subject: ARM: tegra: power: Add suspend index to cpufreq table Original-Change-Id: I7bbe018f3786b9683cc9d4189fdcaadb9098f3f1 Reviewed-on: http://git-master/r/31456 Reviewed-by: Aleksandr Frid Tested-by: Aleksandr Frid Reviewed-by: Diwakar Tundlam Tested-by: Diwakar Tundlam Reviewed-by: Scott Williams Rebase-Id: R81da4e2834a9ae209aadba17337d484f26f67ada --- arch/arm/mach-tegra/cpu-tegra.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-tegra/cpu-tegra.c') diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c index 1d61146b50cc..4c15b3af35c5 100644 --- a/arch/arm/mach-tegra/cpu-tegra.c +++ b/arch/arm/mach-tegra/cpu-tegra.c @@ -52,6 +52,7 @@ static struct clk *emc_clk; static unsigned long target_cpu_speed[CONFIG_NR_CPUS]; static DEFINE_MUTEX(tegra_cpu_lock); static bool is_suspended; +static int suspend_index; unsigned int tegra_getspeed(unsigned int cpu); static int tegra_update_cpu_speed(unsigned long rate); @@ -454,8 +455,8 @@ static int tegra_pm_notify(struct notifier_block *nb, unsigned long event, if (event == PM_SUSPEND_PREPARE) { is_suspended = true; pr_info("Tegra cpufreq suspend: setting frequency to %d kHz\n", - freq_table[0].frequency); - tegra_update_cpu_speed(freq_table[0].frequency); + freq_table[suspend_index].frequency); + tegra_update_cpu_speed(freq_table[suspend_index].frequency); } else if (event == PM_POST_SUSPEND) { is_suspended = false; tegra_cpu_edp_init(true); @@ -539,6 +540,7 @@ static int __init tegra_cpufreq_init(void) struct tegra_cpufreq_table_data *table_data = tegra_cpufreq_table_get(); BUG_ON(!table_data); + suspend_index = table_data->suspend_index; #ifdef CONFIG_TEGRA_THERMAL_THROTTLE /* -- cgit v1.2.3