diff options
-rw-r--r-- | arch/powerpc/platforms/powermac/cpufreq_64.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c index beb38333b6d2..22ecfbe7183d 100644 --- a/arch/powerpc/platforms/powermac/cpufreq_64.c +++ b/arch/powerpc/platforms/powermac/cpufreq_64.c | |||
@@ -86,6 +86,7 @@ static int (*g5_query_freq)(void); | |||
86 | 86 | ||
87 | static DEFINE_MUTEX(g5_switch_mutex); | 87 | static DEFINE_MUTEX(g5_switch_mutex); |
88 | 88 | ||
89 | static unsigned long transition_latency; | ||
89 | 90 | ||
90 | #ifdef CONFIG_PMAC_SMU | 91 | #ifdef CONFIG_PMAC_SMU |
91 | 92 | ||
@@ -357,7 +358,7 @@ static unsigned int g5_cpufreq_get_speed(unsigned int cpu) | |||
357 | 358 | ||
358 | static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy) | 359 | static int g5_cpufreq_cpu_init(struct cpufreq_policy *policy) |
359 | { | 360 | { |
360 | policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL; | 361 | policy->cpuinfo.transition_latency = transition_latency; |
361 | policy->cur = g5_cpu_freqs[g5_query_freq()].frequency; | 362 | policy->cur = g5_cpu_freqs[g5_query_freq()].frequency; |
362 | /* secondary CPUs are tied to the primary one by the | 363 | /* secondary CPUs are tied to the primary one by the |
363 | * cpufreq core if in the secondary policy we tell it that | 364 | * cpufreq core if in the secondary policy we tell it that |
@@ -500,6 +501,7 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus) | |||
500 | g5_cpu_freqs[1].frequency = max_freq/2; | 501 | g5_cpu_freqs[1].frequency = max_freq/2; |
501 | 502 | ||
502 | /* Set callbacks */ | 503 | /* Set callbacks */ |
504 | transition_latency = 12000; | ||
503 | g5_switch_freq = g5_scom_switch_freq; | 505 | g5_switch_freq = g5_scom_switch_freq; |
504 | g5_query_freq = g5_scom_query_freq; | 506 | g5_query_freq = g5_scom_query_freq; |
505 | freq_method = "SCOM"; | 507 | freq_method = "SCOM"; |
@@ -675,6 +677,7 @@ static int __init g5_pm72_cpufreq_init(struct device_node *cpus) | |||
675 | g5_cpu_freqs[1].frequency = min_freq; | 677 | g5_cpu_freqs[1].frequency = min_freq; |
676 | 678 | ||
677 | /* Set callbacks */ | 679 | /* Set callbacks */ |
680 | transition_latency = CPUFREQ_ETERNAL; | ||
678 | g5_switch_volt = g5_pfunc_switch_volt; | 681 | g5_switch_volt = g5_pfunc_switch_volt; |
679 | g5_switch_freq = g5_pfunc_switch_freq; | 682 | g5_switch_freq = g5_pfunc_switch_freq; |
680 | g5_query_freq = g5_pfunc_query_freq; | 683 | g5_query_freq = g5_pfunc_query_freq; |