aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Bilski <rafalbilski@interia.pl>2006-07-15 13:31:30 -0400
committerDave Jones <davej@redhat.com>2006-07-31 18:37:06 -0400
commit32deb2d5c4c291d7d9a73198dc357a151e4b978c (patch)
tree22c5507810098a33bb24e9545b973c6420ba8339
parent9fb31c3a1d9f42e10e541ee0e2be8d1f27115141 (diff)
[CPUFREQ] Longhaul - Rename & fix multipliers table
This table is only used by Ezra-T CPUs currently, and has values for some other CPU. Fix them to match the values used by that CPU, and for now make it clearer by renaming the variable. Signed-off-by: Rafał Bilski <rafalbilski@interia.pl> Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r--arch/i386/kernel/cpu/cpufreq/longhaul.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index ccd1f2c39e18..4f2c3aeef724 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -322,9 +322,11 @@ static int guess_fsb(void)
322static int __init longhaul_get_ranges(void) 322static int __init longhaul_get_ranges(void)
323{ 323{
324 unsigned long invalue; 324 unsigned long invalue;
325 unsigned int multipliers[32]= { 325 unsigned int ezra_t_multipliers[32]= {
326 50,30,40,100,55,35,45,95,90,70,80,60,120,75,85,65, 326 90, 30, 40, 100, 55, 35, 45, 95,
327 -1,110,120,-1,135,115,125,105,130,150,160,140,-1,155,-1,145 }; 327 50, 70, 80, 60, 120, 75, 85, 65,
328 -1, 110, 120, -1, 135, 115, 125, 105,
329 130, 150, 160, 140, -1, 155, -1, 145 };
328 unsigned int j, k = 0; 330 unsigned int j, k = 0;
329 union msr_longhaul longhaul; 331 union msr_longhaul longhaul;
330 unsigned long lo, hi; 332 unsigned long lo, hi;
@@ -353,13 +355,13 @@ static int __init longhaul_get_ranges(void)
353 invalue = longhaul.bits.MaxMHzBR; 355 invalue = longhaul.bits.MaxMHzBR;
354 if (longhaul.bits.MaxMHzBR4) 356 if (longhaul.bits.MaxMHzBR4)
355 invalue += 16; 357 invalue += 16;
356 maxmult=multipliers[invalue]; 358 maxmult=ezra_t_multipliers[invalue];
357 359
358 invalue = longhaul.bits.MinMHzBR; 360 invalue = longhaul.bits.MinMHzBR;
359 if (longhaul.bits.MinMHzBR4 == 1) 361 if (longhaul.bits.MinMHzBR4 == 1)
360 minmult = 30; 362 minmult = 30;
361 else 363 else
362 minmult = multipliers[invalue]; 364 minmult = ezra_t_multipliers[invalue];
363 fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB]; 365 fsb = eblcr_fsb_table_v2[longhaul.bits.MaxMHzFSB];
364 break; 366 break;
365 } 367 }