projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-nuke-platforms-for-linus' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-microblaze.git]
/
drivers
/
cpufreq
/
ppc-corenet-cpufreq.c
diff --git
a/drivers/cpufreq/ppc-corenet-cpufreq.c
b/drivers/cpufreq/ppc-corenet-cpufreq.c
index
051000f
..
3bd9123
100644
(file)
--- a/
drivers/cpufreq/ppc-corenet-cpufreq.c
+++ b/
drivers/cpufreq/ppc-corenet-cpufreq.c
@@
-21,6
+21,7
@@
#include <linux/of.h>
#include <linux/slab.h>
#include <linux/smp.h>
#include <linux/of.h>
#include <linux/slab.h>
#include <linux/smp.h>
+#include <sysdev/fsl_soc.h>
/**
* struct cpu_data - per CPU data struct
/**
* struct cpu_data - per CPU data struct
@@
-205,7
+206,8
@@
static int corenet_cpufreq_cpu_init(struct cpufreq_policy *policy)
for_each_cpu(i, per_cpu(cpu_mask, cpu))
per_cpu(cpu_data, i) = data;
for_each_cpu(i, per_cpu(cpu_mask, cpu))
per_cpu(cpu_data, i) = data;
- policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
+ policy->cpuinfo.transition_latency =
+ (12 * NSEC_PER_SEC) / fsl_get_sys_freq();
of_node_put(np);
return 0;
of_node_put(np);
return 0;
@@
-228,7
+230,6
@@
static int __exit corenet_cpufreq_cpu_exit(struct cpufreq_policy *policy)
struct cpu_data *data = per_cpu(cpu_data, policy->cpu);
unsigned int cpu;
struct cpu_data *data = per_cpu(cpu_data, policy->cpu);
unsigned int cpu;
- cpufreq_frequency_table_put_attr(policy->cpu);
of_node_put(data->parent);
kfree(data->table);
kfree(data);
of_node_put(data->parent);
kfree(data->table);
kfree(data);