diff options
Diffstat (limited to 'drivers/cpufreq/davinci-cpufreq.c')
-rw-r--r-- | drivers/cpufreq/davinci-cpufreq.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/cpufreq/davinci-cpufreq.c b/drivers/cpufreq/davinci-cpufreq.c index 04f3390a7a2c..2cf33848d86e 100644 --- a/drivers/cpufreq/davinci-cpufreq.c +++ b/drivers/cpufreq/davinci-cpufreq.c | |||
@@ -58,14 +58,6 @@ static int davinci_verify_speed(struct cpufreq_policy *policy) | |||
58 | return 0; | 58 | return 0; |
59 | } | 59 | } |
60 | 60 | ||
61 | static unsigned int davinci_getspeed(unsigned int cpu) | ||
62 | { | ||
63 | if (cpu) | ||
64 | return 0; | ||
65 | |||
66 | return clk_get_rate(cpufreq.armclk) / 1000; | ||
67 | } | ||
68 | |||
69 | static int davinci_target(struct cpufreq_policy *policy, unsigned int idx) | 61 | static int davinci_target(struct cpufreq_policy *policy, unsigned int idx) |
70 | { | 62 | { |
71 | struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data; | 63 | struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data; |
@@ -73,7 +65,7 @@ static int davinci_target(struct cpufreq_policy *policy, unsigned int idx) | |||
73 | unsigned int old_freq, new_freq; | 65 | unsigned int old_freq, new_freq; |
74 | int ret = 0; | 66 | int ret = 0; |
75 | 67 | ||
76 | old_freq = davinci_getspeed(0); | 68 | old_freq = policy->cur; |
77 | new_freq = pdata->freq_table[idx].frequency; | 69 | new_freq = pdata->freq_table[idx].frequency; |
78 | 70 | ||
79 | /* if moving to higher frequency, up the voltage beforehand */ | 71 | /* if moving to higher frequency, up the voltage beforehand */ |
@@ -116,6 +108,8 @@ static int davinci_cpu_init(struct cpufreq_policy *policy) | |||
116 | return result; | 108 | return result; |
117 | } | 109 | } |
118 | 110 | ||
111 | policy->clk = cpufreq.armclk; | ||
112 | |||
119 | /* | 113 | /* |
120 | * Time measurement across the target() function yields ~1500-1800us | 114 | * Time measurement across the target() function yields ~1500-1800us |
121 | * time taken with no drivers on notification list. | 115 | * time taken with no drivers on notification list. |
@@ -129,7 +123,7 @@ static struct cpufreq_driver davinci_driver = { | |||
129 | .flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK, | 123 | .flags = CPUFREQ_STICKY | CPUFREQ_NEED_INITIAL_FREQ_CHECK, |
130 | .verify = davinci_verify_speed, | 124 | .verify = davinci_verify_speed, |
131 | .target_index = davinci_target, | 125 | .target_index = davinci_target, |
132 | .get = davinci_getspeed, | 126 | .get = cpufreq_generic_get, |
133 | .init = davinci_cpu_init, | 127 | .init = davinci_cpu_init, |
134 | .exit = cpufreq_generic_exit, | 128 | .exit = cpufreq_generic_exit, |
135 | .name = "davinci", | 129 | .name = "davinci", |