diff options
author | Richard Zhao <richard.zhao@freescale.com> | 2012-09-14 15:15:05 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-14 15:15:05 -0400 |
commit | cd664cc3a574b30988476143c1dcc9298b1fa531 (patch) | |
tree | 9153bd08bb0d8ca9ac69667086c4101a91b9ca33 | |
parent | 21ce35dc79346eb206f3271f3cc07fb9a5452ae7 (diff) |
cpufreq: OMAP: remove loops_per_jiffy recalculate for smp
With ARM smp common code recalculating loops_per_jiffy in a cpufreq
transiton notifier call, the loops_per_jiffy recalculate in omap-cpufreq
driver becomes redundant. Remove it.
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r-- | drivers/cpufreq/omap-cpufreq.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/cpufreq/omap-cpufreq.c b/drivers/cpufreq/omap-cpufreq.c index b47034e650a5..6e22f4481c07 100644 --- a/drivers/cpufreq/omap-cpufreq.c +++ b/drivers/cpufreq/omap-cpufreq.c | |||
@@ -40,16 +40,6 @@ | |||
40 | /* OPP tolerance in percentage */ | 40 | /* OPP tolerance in percentage */ |
41 | #define OPP_TOLERANCE 4 | 41 | #define OPP_TOLERANCE 4 |
42 | 42 | ||
43 | #ifdef CONFIG_SMP | ||
44 | struct lpj_info { | ||
45 | unsigned long ref; | ||
46 | unsigned int freq; | ||
47 | }; | ||
48 | |||
49 | static DEFINE_PER_CPU(struct lpj_info, lpj_ref); | ||
50 | static struct lpj_info global_lpj_ref; | ||
51 | #endif | ||
52 | |||
53 | static struct cpufreq_frequency_table *freq_table; | 43 | static struct cpufreq_frequency_table *freq_table; |
54 | static atomic_t freq_table_users = ATOMIC_INIT(0); | 44 | static atomic_t freq_table_users = ATOMIC_INIT(0); |
55 | static struct clk *mpu_clk; | 45 | static struct clk *mpu_clk; |
@@ -161,31 +151,6 @@ static int omap_target(struct cpufreq_policy *policy, | |||
161 | } | 151 | } |
162 | 152 | ||
163 | freqs.new = omap_getspeed(policy->cpu); | 153 | freqs.new = omap_getspeed(policy->cpu); |
164 | #ifdef CONFIG_SMP | ||
165 | /* | ||
166 | * Note that loops_per_jiffy is not updated on SMP systems in | ||
167 | * cpufreq driver. So, update the per-CPU loops_per_jiffy value | ||
168 | * on frequency transition. We need to update all dependent CPUs. | ||
169 | */ | ||
170 | for_each_cpu(i, policy->cpus) { | ||
171 | struct lpj_info *lpj = &per_cpu(lpj_ref, i); | ||
172 | if (!lpj->freq) { | ||
173 | lpj->ref = per_cpu(cpu_data, i).loops_per_jiffy; | ||
174 | lpj->freq = freqs.old; | ||
175 | } | ||
176 | |||
177 | per_cpu(cpu_data, i).loops_per_jiffy = | ||
178 | cpufreq_scale(lpj->ref, lpj->freq, freqs.new); | ||
179 | } | ||
180 | |||
181 | /* And don't forget to adjust the global one */ | ||
182 | if (!global_lpj_ref.freq) { | ||
183 | global_lpj_ref.ref = loops_per_jiffy; | ||
184 | global_lpj_ref.freq = freqs.old; | ||
185 | } | ||
186 | loops_per_jiffy = cpufreq_scale(global_lpj_ref.ref, global_lpj_ref.freq, | ||
187 | freqs.new); | ||
188 | #endif | ||
189 | 154 | ||
190 | done: | 155 | done: |
191 | /* notifiers */ | 156 | /* notifiers */ |