Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346787
b: refs/heads/master
c: bb29b71
h: refs/heads/master
i:
  346785: 43d5861
  346783: 301f80b
v: v3
  • Loading branch information
Andreas Schwab authored and Benjamin Herrenschmidt committed Nov 15, 2012
1 parent 0004d9e commit 91d3da3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ec1b33dcd2c0ed773e6458d1c8b337966114562b
refs/heads/master: bb29b719372742939af05457aff1b59608764e89
5 changes: 4 additions & 1 deletion trunk/arch/powerpc/platforms/powermac/cpufreq_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ static unsigned int low_freq;
static unsigned int hi_freq;
static unsigned int cur_freq;
static unsigned int sleep_freq;
static unsigned long transition_latency;

/*
* Different models uses different mechanisms to switch the frequency
Expand Down Expand Up @@ -403,7 +404,7 @@ static int pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
if (policy->cpu != 0)
return -ENODEV;

policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
policy->cpuinfo.transition_latency = transition_latency;
policy->cur = cur_freq;

cpufreq_frequency_table_get_attr(pmac_cpu_freqs, policy->cpu);
Expand Down Expand Up @@ -658,12 +659,14 @@ static int __init pmac_cpufreq_setup(void)
if (!value)
goto out;
cur_freq = (*value) / 1000;
transition_latency = CPUFREQ_ETERNAL;

/* Check for 7447A based MacRISC3 */
if (of_machine_is_compatible("MacRISC3") &&
of_get_property(cpunode, "dynamic-power-step", NULL) &&
PVR_VER(mfspr(SPRN_PVR)) == 0x8003) {
pmac_cpufreq_init_7447A(cpunode);
transition_latency = 8000000;
/* Check for other MacRISC3 machines */
} else if (of_machine_is_compatible("PowerBook3,4") ||
of_machine_is_compatible("PowerBook3,5") ||
Expand Down

0 comments on commit 91d3da3

Please sign in to comment.