Changeset 3190

Show
Ignore:
Timestamp:
11/12/05 10:30:38 (3 years ago)
Author:
khali
Message:

Drop DEFAULT_VRM, as it makes no sense to have a single default
VRM for all drivers. Same was done it Linux 2.6 some times ago.
Also comment out all "set vrm" lines in sensors.conf.eg, as Linux 2.6
now accurately deduces the VRM from the CPU model.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/CHANGES

    r3182 r3190  
    2121  File doc/busses/i2c-viapro: Update (2.6 backport) 
    2222  File doc/chips/via686a: Update (2.6 backport) 
     23  File etc/sensors.conf.eg: Do not set vrm by default 
    2324  File i2c-dev.h: Fix union i2c_smbus_data definition 
    2425                  Sync i2c_msg definition with i2c.h (Hideki Iwamoto) 
    …… 
    2728                  Drop I2C_FUNC_SMBUS_*_PEC 
    2829                  Drop I2C_SMBUS_*_PEC 
     30  File sensors_vid.h: Drop default VRM 
    2931  Library: Big update to use libsysfs.  More TODO though. 
    3032           Fix bus matching code for Linux 2.6 (Karsten Petersen) 
    …… 
    5557  Module via686a: Cleanups 
    5658  Module w83627hf: Drop useless initialization step (2.6 backport) 
     59                   Fix in4 for W83627THF and W83637HF (Yuan Mu) 
     60                   Fix alarms (Yuan Mu) 
     61                   Preserve fan min on fan div change (Yuan Mu) 
    5762  Module w83781d: Drop W83697HF support (Grant Coady) 
    5863  Module w83l785ts: Minor cleanup (2.6 backport) 
     64  Modules vt1211, vt8231: Change default VRM to 9.1 
    5965  Program decode-dimms.pl: Add lookup tables for manufacturer names 
    6066                           Fix rounding error in PCxxxx speed computation 

  • lm-sensors/trunk/etc/sensors.conf.eg

    r3187 r3190  
    19821982    compute in5 ((@ * 100) - 3) / (0.6296 * 95.8), (@ * 0.6296 * 0.958) + .03 
    19831983 
    1984     set vrm 9.1 
     1984# adjust this if your vid is wrong; see doc/vid 
     1985#   set vrm 9.1 
     1986 
    19851987#   set in0_min 2.5 * 0.95 
    19861988#   set in0_max 2.5 * 1.05 
    …… 
    20522054# 
    20532055chip "asb100-*" 
    2054     set vrm 9.0 
     2056# adjust this if your vid is wrong; see doc/vid 
     2057    #set vrm 9.0 
    20552058 
    20562059    label in0 "VCore 1" 
    …… 
    21722175 
    21732176# Set VRM version 
    2174    set vrm  9.1   # Pentium 4 
     2177# adjust this if your vid is wrong; see doc/vid 
     2178#   set vrm  9.1   # Pentium 4 
    21752179 
    21762180# Set voltage limits 

  • lm-sensors/trunk/kernel/chips/asb100.c

    r3028 r3190  
    6060static unsigned int normal_isa_range[] = { SENSORS_ISA_END }; 
    6161 
    62 /* default VRM to 9.0 instead of 8.2 */ 
     62/* default VRM to 9.0 */ 
    6363#define ASB100_DEFAULT_VRM 90 
    6464 

  • lm-sensors/trunk/kernel/chips/lm87.c

    r3000 r3190  
    549549        ); 
    550550 
    551         data->vrm = DEFAULT_VRM; 
     551        data->vrm = 82; 
    552552 
    553553        /* Start monitoring */ 

  • lm-sensors/trunk/kernel/chips/vt1211.c

    r3044 r3190  
    480480        struct vt1211_data *data = client->data; 
    481481 
    482         data->vrm = DEFAULT_VRM; 
     482        data->vrm = 91; 
    483483        /* set "default" interrupt mode for alarms, which isn't the default */ 
    484484        vt1211_write_value(client, VT1211_REG_TEMP1_CONFIG, 0); 

  • lm-sensors/trunk/kernel/chips/vt8231.c

    r3044 r3190  
    452452        struct vt8231_data *data = client->data; 
    453453 
    454         data->vrm = DEFAULT_VRM; 
     454        data->vrm = 91; 
    455455        /* set "default" interrupt mode for alarms, which isn't the default */ 
    456456        vt8231_write_value(client, VT8231_REG_TEMP1_CONFIG, 0); 

  • lm-sensors/trunk/kernel/include/sensors_vid.h

    r2688 r3190  
    5252*/ 
    5353 
    54 #define DEFAULT_VRM     82 
    55  
    5654static inline int vid_from_reg(int val, int vrm) 
    5755{