aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/cpu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-integrator/cpu.c')
-rw-r--r--arch/arm/mach-integrator/cpu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index 7f1b73b776a7..c4e5debeb48c 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -31,7 +31,7 @@ static struct cpufreq_driver integrator_driver;
31#define CM_STAT IO_ADDRESS(INTEGRATOR_HDR_STAT) 31#define CM_STAT IO_ADDRESS(INTEGRATOR_HDR_STAT)
32#define CM_LOCK IO_ADDRESS(INTEGRATOR_HDR_LOCK) 32#define CM_LOCK IO_ADDRESS(INTEGRATOR_HDR_LOCK)
33 33
34static const struct icst525_params lclk_params = { 34static const struct icst_params lclk_params = {
35 .ref = 24000, 35 .ref = 24000,
36 .vco_max = 320000, 36 .vco_max = 320000,
37 .vd_min = 8, 37 .vd_min = 8,
@@ -40,7 +40,7 @@ static const struct icst525_params lclk_params = {
40 .rd_max = 24, 40 .rd_max = 24,
41}; 41};
42 42
43static const struct icst525_params cclk_params = { 43static const struct icst_params cclk_params = {
44 .ref = 24000, 44 .ref = 24000,
45 .vco_max = 320000, 45 .vco_max = 320000,
46 .vd_min = 12, 46 .vd_min = 12,
@@ -54,7 +54,7 @@ static const struct icst525_params cclk_params = {
54 */ 54 */
55static int integrator_verify_policy(struct cpufreq_policy *policy) 55static int integrator_verify_policy(struct cpufreq_policy *policy)
56{ 56{
57 struct icst525_vco vco; 57 struct icst_vco vco;
58 58
59 cpufreq_verify_within_limits(policy, 59 cpufreq_verify_within_limits(policy,
60 policy->cpuinfo.min_freq, 60 policy->cpuinfo.min_freq,
@@ -80,7 +80,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
80{ 80{
81 cpumask_t cpus_allowed; 81 cpumask_t cpus_allowed;
82 int cpu = policy->cpu; 82 int cpu = policy->cpu;
83 struct icst525_vco vco; 83 struct icst_vco vco;
84 struct cpufreq_freqs freqs; 84 struct cpufreq_freqs freqs;
85 u_int cm_osc; 85 u_int cm_osc;
86 86
@@ -156,7 +156,7 @@ static unsigned int integrator_get(unsigned int cpu)
156 cpumask_t cpus_allowed; 156 cpumask_t cpus_allowed;
157 unsigned int current_freq; 157 unsigned int current_freq;
158 u_int cm_osc; 158 u_int cm_osc;
159 struct icst525_vco vco; 159 struct icst_vco vco;
160 160
161 cpus_allowed = current->cpus_allowed; 161 cpus_allowed = current->cpus_allowed;
162 162