Changeset 4357

Show
Ignore:
Timestamp:
04/03/07 14:55:30 (2 years ago)
Author:
mmh
Message:

Merge from trunk (4303:4355) out to 3.0.0 branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/branches/lm-sensors-3.0.0/CHANGES

    r4301 r4357  
    33 
    44SVN HEAD 
     5  File sensors.conf.eg: Add a dme1737 section 
     6  Library: Clean up pwm symbol names translation 
     7           Add dme1737 support 
     8  Program isadump: Detect when address bit 7 is a busy flag 
     9  Program sensors: Drop ddcmon and eeprom support 
     10                   Add dme1737 support 
     11  Program sensors-detect: Stop Super-I/O probe after first family success 
     12                          Fix SMSC DME1737 detection 
     13 
     14 
     152.10.3 (20070319) 
     16  Library: Do not skip i2c adapters with only a class device and no 
     17            physical device. This change is required to survive the 
     18            planned struct class_dev removal from future 2.6 kernels. 
     19           Add support for the SMSC LPC47M292 fans (prefix smsc47m2) 
     20           Recognize i2c-isa-based devices as such even after class_dev 
     21            is gone 
     22           Compile with -D_REENTRANT 
     23           Fix support of Linux 2.6's max6650 driver 
     24           Fix max1619 support 
     25  Man page i2cdetect.8: Scanning range can be restricted 
     26  Module bmcsensors: Fix debugging messages 
     27  Module i2c-ali1563: Improve the status messages (2.6 backport) 
     28                      Fix device initialization (2.6 backport) 
     29  Module i2c-amd8111: Cleanups (2.6 backport) 
     30                      Fix initialization race (2.6 backport) 
     31  Module i2c-nforce2: Drop unused reference to pci_dev (2.6 backport) 
     32  Module i2c-piix4: Add ATI SB600 support (2.6 backport) 
     33  Module i2c-viapro: Add CX700 support (2.6 backport) 
     34  Module smsc47m1: Add SMSC LPC47M292 support 
     35                   Get rid of a useless semaphore (2.6 backport) 
     36  Programs i2cdetect, i2cdump, isadump: Flush output in real time 
     37  Program i2cdump: Cleaner output in SMBus block read mode 
     38  Program fancontrol.pl: Fix pwmN_enable access (#2190) 
     39  Program sensors: Add smsc47m2 support (fans) 
     40                   Fix -A option (hide adapter name) on error 
     41  Program sensors-detect: Only probe relevant I2C addresses 
     42                          Drop ARP-capable device detection 
     43                          Add Maxim MAX6655/MAX6656 detection 
     44                           (Olexiy Avramchenko) 
     45                          Add Maxim MAX1668, MAX1805, MAX1989 detection 
     46                          Add VIA CX700 detection 
     47                          Drop legacy W83627HF ISA detection 
     48                          Don't bufferize stdout during probes 
     49                          Speed up the LM75 and LM77 detection 
     50                          Clean up the EEPROM detection 
     51                          Add Dallas DS75 detection 
     52                          Add SMSC LPC47M292 detection 
     53                          Add nVidia MCP61 and MCP65 detection 
     54                          Fix ADM1028 detection 
     55                          Add Nat. Semi. PC8347L Super-I/O detection 
     56                          Add SMSC SCH5504 Super-I/O detection (no sensors) 
     57                          Make the LM78 and W83781D detection safer 
     58 
    559 
    6602.10.2 (20070115) 

  • lm-sensors/branches/lm-sensors-3.0.0/Makefile

    r4272 r4357  
    280280LIBCPPFLAGS := $(LIBCPPFLAGS) -DSYSFS_SUPPORT 
    281281endif 
    282 LIBCFLAGS := -fpic $(ALL_CFLAGS) 
     282LIBCFLAGS := -fpic -D_REENTRANT $(ALL_CFLAGS) 
    283283 
    284284.PHONY: all user clean install user_install uninstall user_uninstall version package 

  • lm-sensors/branches/lm-sensors-3.0.0/README

    r4252 r4357  
    4848  AMD 8111 SMBus 2.0 
    4949  Apple Hydra (used on some PPC machines) 
    50   ATI IXP200, IXP300, IXP400 
     50  ATI IXP200, IXP300, IXP400, SB600 
    5151  DEC 21272/21274 (Tsunami/Typhoon - on Alpha boards) 
    5252  Intel ICH/ICH0/ICH2/ICH3/ICH4/ICH5/ICH6/ICH7/ICH8/ICH9 (82801xx) 
    …… 
    6161  3Dfx Voodoo 3 and Banshee 
    6262  VIA Technologies VT82C586B, VT82C596A/B, VT82C686A/B, VT8231, 
    63                    VT8233, VT8233A, VT8235, VT8237R/A and VT8251 
     63                   VT8233, VT8233A, VT8235, VT8237R/A, VT8251, CX700 
    6464 
    6565 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/busses/i2c-piix4

    r4064 r4357  
    1010  * ServerWorks OSB4, CSB5, CSB6 and HT-1000 southbridges 
    1111    Datasheet: Only available via NDA from ServerWorks 
    12   * ATI IXP southbridges IXP200, IXP300, IXP400 
     12  * ATI IXP200, IXP300, IXP400 and SB600 southbridges  
    1313    Datasheet: Not publicly available 
    1414  * Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/busses/i2c-viapro

    r4127 r4357  
    1111 
    1212  * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237R/A, VT8251 
    13     Datasheet: available on request from Via 
     13    Datasheet: available on request and under NDA from VIA 
     14 
     15  * VIA Technologies, Inc. CX700 
     16    Datasheet: available on request and under NDA from VIA 
    1417 
    1518Authors: 
    …… 
    4649 device 1106:3337   (VT8237A) 
    4750 device 1106:3287   (VT8251) 
     51 device 1106:8324   (CX700) 
    4852 
    4953If none of these show up, you should look in the BIOS for settings like 
    …… 
    5357VT8231), this driver supports I2C block transactions. Such transactions 
    5458are mainly useful to read from and write to EEPROMs. 
     59 
     60The CX700 additionally appears to support SMBus PEC, although this driver 
     61doesn't implement it. 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/chips/SUMMARY

    r4259 r4357  
    221221        smsc47m192      -       -       2       2       no      yes (LPC) 
    222222        smsc47m997      -       -       2       2       no      yes (LPC) 
     223        (reported as a "smsc47m2") 
     224        smsc47m292      -       -       3       3       no      yes (LPC) 
    223225 
    224226thmc50 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/chips/lm90

    r3181 r4357  
    177177Instead, it will try to write the PEC value to the register (because the 
    178178SMBus Send Byte transaction with PEC is similar to a Write Byte transaction 
    179 without PEC), which is not what we want. Thus, PEC is explicitely disabled 
     179without PEC), which is not what we want. Thus, PEC is explicitly disabled 
    180180on SMBus Send Byte transactions in the lm90 driver. 
    181181 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/chips/max6650

    r2028 r4357  
    55---------- 
    66 
    7 The MAX6551 is a fan controller. It has two distinct functions: 
     7The MAX6651 is a fan controller. It has two distinct functions: 
    88 
    991) Speed control, with feedback, for a single fan. The code can write 
    …… 
    1515   controlled one. 
    1616 
    17 The MAX6550 is similar but only has one measurement tachometer. 
     17The MAX6650 is similar but only has one measurement tachometer. 
    1818 
    1919Both chips have a few general purpose i/o pins, some of which can be  
    …… 
    2323     http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2296/ln/en 
    2424 
    25 If that has moved searching for MAX6550 from Maxim's home page should  
     25If that has moved searching for MAX6650 from Maxim's home page should  
    2626work. 
    2727 
    …… 
    8080   done it. 
    8181 
    82  o It does not differentiate between a MAX6550 and a MAX6551, as I can 
    83    see no obvious way to do this. It has only been tested with a MAX6551  
    84    so if anyone gets a board with a MAX6550 to test with maybe something  
     82 o It does not differentiate between a MAX6650 and a MAX6651, as I can 
     83   see no obvious way to do this. It has only been tested with a MAX6651  
     84   so if anyone gets a board with a MAX6650 to test with maybe something  
    8585   will be revealed, such as the three missing tachometer registers 
    8686   returning all ones or something. (OK, so maybe I should have called 
    …… 
    9797register, but there are several registers with all zero bits at the  
    9898high end. The driver checks that all of these are in fact zero before 
    99 declaring the chip to be a MAX6550/1. 
     99declaring the chip to be a MAX6650/1. 
    100100 
    101101sensors-detect 
    …… 
    103103 
    104104Support for MAX6650/1 has been added to sensors-detect. It has been 
    105 tested as correctly detecting a MAX6551 at I2C address 0x1B. Like the 
     105tested as correctly detecting a MAX6651 at I2C address 0x1B. Like the 
    106106driver, it cannot yet distinguish a MAX6650 and MAX6651. 
    107107 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/chips/smsc47m1

    r4218 r4357  
    1717        http://www.smsc.com/main/tools/discontinued/47m15x.pdf 
    1818        http://www.smsc.com/main/datasheets/47m192.pdf 
     19  * SMSC LPC47M292 
     20    Prefix: 'smsc47m2' 
     21    Addresses scanned: none, address read from Super I/O config space 
     22    Datasheet: Not public 
    1923  * SMSC LPC47M997 
    2024    Addresses scanned: none, address read from Super I/O config space 
    …… 
    4246contain monitoring and PWM control circuitry for two fans. 
    4347 
    44 The 47M15x and 47M192 chips contain a full 'hardware monitoring block' 
    45 in addition to the fan monitoring and control. The hardware monitoring 
    46 block is not supported by the driver. 
     48The LPC47M15x, LPC47M192 and LPC47M292 chips contain a full 'hardware 
     49monitoring block' in addition to the fan monitoring and control. The 
     50hardware monitoring block is not supported by the driver. 
    4751 
    4852No documentation is available for the 47M997, but it has the same device 

  • lm-sensors/branches/lm-sensors-3.0.0/doc/useful_addresses.html

    r4226 r4357  
    157157        As far we know only one motherboard manufacturer provides sensors.conf files:</p> 
    158158        <ul> 
    159         <li><a href="http://www.tyan.com/support/html/software_utilities.html#lms">TYAN motherboads sensors.conf 
    160         files database</a></li> 
     159        <li><a href="http://www.tyan.com/archive/support/html/software_utilities.html#lms">TYAN motherboads sensors.conf 
     160        files database (archive link)</a></li> 
     161        <li><a href="ftp://ftp.tyan.com/software/lms/">TYAN motherboads sensors.conf 
     162        files database (ftp link)</a> 
     163        </li> 
    161164        </ul> 
    162165 

  • lm-sensors/branches/lm-sensors-3.0.0/etc/sensors.conf.eg

    r4264 r4357  
    28142814   label temp3 "Core1 Temp" 
    28152815   label temp4 "Core1 Temp" 
     2816 
     2817 
     2818# 
     2819# Sample configuration for the SMSC DME1737 and ASUS A8000 
     2820# 
     2821chip "dme1737-*" 
     2822 
     2823# Voltage inputs 
     2824   label in0   "V5stby" 
     2825   label in1   "Vccp" 
     2826   label in2   "V3.3" 
     2827   label in3   "V5" 
     2828   label in4   "V12" 
     2829   label in5   "V3.3stby" 
     2830   label in6   "Vbat" 
     2831 
     2832# Temperature inputs 
     2833   label temp1   "RD1 Temp" 
     2834   label temp2   "Int Temp" 
     2835   label temp3   "CPU Temp" 
     2836 
     2837# Fan inputs 
     2838   label fan1   "CPU_Fan" 
     2839   label fan2   "Fan2" 
     2840   label fan3   "Fan3" 
     2841   label fan4   "Fan4" 
     2842   label fan5   "Fan5" 
     2843   label fan6   "Fan6" 
     2844 
     2845# PWM Outputs 
     2846   label pwm1   "CPU_PWM" 
     2847   label pwm2   "Fan2_PWM" 
     2848   label pwm3   "Fan3_PWM" 
     2849   label pwm5   "Fan5_PWM" 
     2850   label pwm6   "Fan6_PWM" 
     2851 
     2852# Set voltage limits 
     2853#   set in0_min   5.0 * 0.95 
     2854#   set in0_max   5.0 * 1.05 
     2855#   set in1_min   1.4 * 0.95 
     2856#   set in1_max   1.4 * 1.05 
     2857#   set in2_min   3.3 * 0.95 
     2858#   set in2_max   3.3 * 1.05 
     2859#   set in3_min   5.0 * 0.95 
     2860#   set in3_max   5.0 * 1.05 
     2861#   set in4_min  12.0 * 0.95 
     2862#   set in4_max  12.0 * 1.05 
     2863#   set in5_min   3.3 * 0.95 
     2864#   set in5_max   3.3 * 1.05 
     2865#   set in6_min   3.0 * 0.95 
     2866#   set in6_max   3.0 * 1.05 
     2867 
     2868# Set Temp Limits 
     2869#   set temp1_min 10 
     2870#   set temp1_max 75 
     2871#   set temp2_min 10 
     2872#   set temp2_max 75 
     2873#   set temp3_min 10 
     2874#   set temp3_max 75 
     2875 
     2876# Set Fan limits 
     2877#   set fan1_min 1000 
     2878#   set fan2_min 1000 
     2879#   set fan3_min 1000 
     2880#   set fan4_min 1000 
     2881#   set fan5_min 1000 
     2882#   set fan6_min 1000 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/busses/i2c-ali1563.c

    r3149 r4357  
    327327 
    328328 
    329 static void ali1563_enable(struct pci_dev * dev) 
     329static int __devinit ali1563_setup(struct pci_dev * dev) 
    330330{ 
    331331        u16 ctrl; 
    332332 
    333333        pci_read_config_word(dev,ALI1563_SMBBA,&ctrl); 
    334         ctrl |= 0x7; 
    335         pci_write_config_word(dev,ALI1563_SMBBA,ctrl); 
    336 } 
    337  
    338 static int __devinit ali1563_setup(struct pci_dev * dev) 
    339 { 
    340         u16 ctrl; 
    341  
    342         pci_read_config_word(dev,ALI1563_SMBBA,&ctrl); 
    343         printk(KERN_DEBUG "ali1563: SMBus control = %04x\n",ctrl); 
    344  
    345         /* Check if device is even enabled first */ 
    346         if (!(ctrl & ALI1563_SMB_IOEN)) { 
    347                 printk(KERN_WARNING "ali1563: I/O space not enabled, trying manually\n"); 
    348                 ali1563_enable(dev); 
    349         } 
    350         if (!(ctrl & ALI1563_SMB_IOEN)) { 
    351                 printk(KERN_WARNING "ali1563: I/O space still not enabled, giving up\n"); 
    352                 goto Err; 
    353         } 
    354         if (!(ctrl & ALI1563_SMB_HOSTEN)) { 
    355                 printk(KERN_WARNING "ali1563: Host Controller not enabled\n"); 
    356                 goto Err; 
    357         } 
    358334 
    359335        /* SMB I/O Base in high 12 bits and must be aligned with the 
    …… 
    364340                goto Err; 
    365341        } 
     342 
     343        /* Check if device is enabled */ 
     344        if (!(ctrl & ALI1563_SMB_HOSTEN)) { 
     345                printk(KERN_WARNING "ali1563: Host Controller not enabled\n"); 
     346                goto Err; 
     347        } 
     348        if (!(ctrl & ALI1563_SMB_IOEN)) { 
     349                printk(KERN_WARNING "I/O space not enabled, trying manually\n"); 
     350                pci_write_config_word(dev, ALI1563_SMBBA, 
     351                                      ctrl | ALI1563_SMB_IOEN); 
     352                pci_read_config_word(dev, ALI1563_SMBBA, &ctrl); 
     353                if (!(ctrl & ALI1563_SMB_IOEN)) { 
     354                        printk(KERN_WARNING "I/O space still not enabled, " 
     355                               "giving up\n"); 
     356                        goto Err; 
     357                } 
     358        } 
     359 
    366360        if (!request_region(ali1563_smba, ALI1563_SMB_IOSIZE, 
    367361                            ali1563_pci_driver.name)) { 
    368                 printk(KERN_WARNING "ali1563: Could not allocate I/O space"); 
     362                printk(KERN_WARNING "ali1563: Could not allocate I/O space " 
     363                       "at 0x%04x\n", ali1563_smba); 
    369364                goto Err; 
    370365        } 
     366        printk(KERN_INFO "ali1563: Found ALi1563 SMBus at 0x%04x\n", 
     367               ali1563_smba); 
    371368 
    372369        return 0; 
    …… 
    412409        int error; 
    413410 
    414         if ((error = ali1563_setup(dev))){ 
     411        if ((error = ali1563_setup(dev))) { 
     412                printk(KERN_WARNING "ali1563: ALi1563 SMBus probe failed " 
     413                       "(%d)\n", error); 
    415414                return error; 
    416415        } 
    …… 
    419418        if ((error = i2c_add_adapter(&ali1563_adapter))) 
    420419                ali1563_shutdown(dev); 
    421         printk(KERN_DEBUG "%s: Returning %d\n",__FUNCTION__,error); 
    422420        return error; 
    423421} 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/busses/i2c-amd8111.c

    r3177 r4357  
    216216                        amd_ec_write(smbus, AMD_SMB_CMD, command); 
    217217                        if (read_write == I2C_SMBUS_WRITE) { 
    218                                 amd_ec_write(smbus, AMD_SMB_DATA, data->word); 
     218                                amd_ec_write(smbus, AMD_SMB_DATA, data->word & 0xff); 
    219219                                amd_ec_write(smbus, AMD_SMB_DATA + 1, data->word >> 8); 
    220220                        } 
    …… 
    225225                        amd_ec_write(smbus, AMD_SMB_CMD, command); 
    226226                        if (read_write == I2C_SMBUS_WRITE) { 
    227                                 len = min_t(u8, data->block[0], 32); 
     227                                len = min_t(u8, data->block[0], I2C_SMBUS_BLOCK_MAX); 
    228228                                amd_ec_write(smbus, AMD_SMB_BCNT, len); 
    229229                                for (i = 0; i < len; i++) 
    …… 
    234234 
    235235                case I2C_SMBUS_I2C_BLOCK_DATA: 
    236                         len = min_t(u8, data->block[0], 32); 
     236                        len = min_t(u8, data->block[0], I2C_SMBUS_BLOCK_MAX); 
    237237                        amd_ec_write(smbus, AMD_SMB_CMD, command); 
    238238                        amd_ec_write(smbus, AMD_SMB_BCNT, len); 
    …… 
    245245                case I2C_SMBUS_PROC_CALL: 
    246246                        amd_ec_write(smbus, AMD_SMB_CMD, command); 
    247                         amd_ec_write(smbus, AMD_SMB_DATA, data->word); 
     247                        amd_ec_write(smbus, AMD_SMB_DATA, data->word & 0xff); 
    248248                        amd_ec_write(smbus, AMD_SMB_DATA + 1, data->word >> 8); 
    249249                        protocol = AMD_SMB_PRTCL_PROC_CALL | pec; 
    …… 
    252252 
    253253                case I2C_SMBUS_BLOCK_PROC_CALL: 
    254                         len = min_t(u8, data->block[0], 31); 
     254                        len = min_t(u8, data->block[0], I2C_SMBUS_BLOCK_MAX - 1); 
    255255                        amd_ec_write(smbus, AMD_SMB_CMD, command); 
    256256                        amd_ec_write(smbus, AMD_SMB_BCNT, len); 
    …… 
    304304                case I2C_SMBUS_BLOCK_PROC_CALL: 
    305305                        amd_ec_read(smbus, AMD_SMB_BCNT, &len); 
    306                         len = min_t(u8, len, 32); 
     306                        len = min_t(u8, len, I2C_SMBUS_BLOCK_MAX); 
    307307                case I2C_SMBUS_I2C_BLOCK_DATA: 
    308308                        for (i = 0; i < len; i++) 
    …… 
    355355        int error; 
    356356 
    357         if (~pci_resource_flags(dev, 0) & IORESOURCE_IO) 
    358                 return -1; 
     357        if (!(pci_resource_flags(dev, 0) & IORESOURCE_IO)) 
     358                return -ENODEV; 
    359359 
    360360        if (!(smbus = kmalloc(sizeof(struct amd_smbus), GFP_KERNEL))) 
    361                 return -1; 
     361                return -ENOMEM; 
    362362        memset(smbus, 0, sizeof(struct amd_smbus)); 
    363363 
    …… 
    369369        if (!request_region(smbus->base, smbus->size, amd8111_driver.name)) { 
    370370                kfree(smbus); 
    371                 return -1; 
     371                return -EBUSY; 
    372372        } 
    373373 
    …… 
    379379        smbus->adapter.dec_use = amd8111_dec; 
    380380 
     381        pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0); 
     382 
    381383        error = i2c_add_adapter(&smbus->adapter); 
    382384        if (error) { 
    …… 
    384386                release_region(smbus->base, smbus->size); 
    385387                kfree(smbus); 
    386                 return -1; 
    387         } 
    388  
    389         pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0); 
     388                return error; 
     389        } 
    390390 
    391391        printk(KERN_INFO "i2c-amd8111.c: AMD8111 SMBus 2.0 adapter at %#x\n", smbus->base); 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/busses/i2c-nforce2.c

    r4054 r4357  
    8383 
    8484struct nforce2_smbus { 
    85         struct pci_dev *dev; 
    8685        struct i2c_adapter adapter; 
    8786        int base; 
    …… 
    337336                smbus->size = 8; 
    338337        } 
    339         smbus->dev = dev; 
    340338 
    341339        if (!request_region(smbus->base, smbus->size, nforce2_driver.name)) { 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/busses/i2c-piix4.c

    r4278 r4357  
    2424        Intel PIIX4, 440MX 
    2525        Serverworks OSB4, CSB5, CSB6, HT-1000 
    26         ATI IXP200, IXP300, IXP400 
     26        ATI IXP200, IXP300, IXP400, SB600 
    2727        SMSC Victory66 
    2828 
    …… 
    439439#define PCI_DEVICE_ID_ATI_IXP300_SMBUS  0x4363 
    440440#define PCI_DEVICE_ID_ATI_IXP400_SMBUS  0x4372 
     441#define PCI_DEVICE_ID_ATI_IXP600_SMBUS  0x4385 
    441442 
    442443#ifndef PCI_DEVICE_ID_SERVERWORKS_CSB6 
    …… 
    471472                .vendor =       PCI_VENDOR_ID_ATI, 
    472473                .device =       PCI_DEVICE_ID_ATI_IXP400_SMBUS, 
     474                .subvendor =    PCI_ANY_ID, 
     475                .subdevice =    PCI_ANY_ID, 
     476                .driver_data =  0, 
     477        }, 
     478        { 
     479                .vendor =       PCI_VENDOR_ID_ATI, 
     480                .device =       PCI_DEVICE_ID_ATI_IXP600_SMBUS, 
    473481                .subvendor =    PCI_ANY_ID, 
    474482                .subdevice =    PCI_ANY_ID, 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/busses/i2c-viapro.c

    r4125 r4357  
    55    Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>, 
    66    Mark D. Studebaker <mdsxyz123@yahoo.com> 
    7     Copyright (C) 2005 Jean Delvare <khali@linux-fr.org> 
     7    Copyright (C) 2005 - 2007 Jean Delvare <khali@linux-fr.org> 
    88 
    99    This program is free software; you can redistribute it and/or modify 
    …… 
    3737   VT8237A            0x3337             yes 
    3838   VT8251             0x3287             yes 
     39   CX700              0x8324             yes 
    3940 
    4041   Note: we assume there can only be one device, with one SMBus interface. 
    …… 
    6465#define PCI_DEVICE_ID_VIA_8237  0x3227 
    6566#endif 
    66 /* 8237A is undefined as for the kernel 2.4.33 */ 
     67/* 8237A is undefined */ 
    6768#ifndef PCI_DEVICE_ID_VIA_8237A 
    6869#define PCI_DEVICE_ID_VIA_8237A 0x3337 
    6970#endif 
    70 /* 8251 is undefined as for the kernel 2.4.33 */ 
     71/* 8251 is undefined */ 
    7172#ifndef PCI_DEVICE_ID_VIA_8251 
    7273#define PCI_DEVICE_ID_VIA_8251  0x3287 
     74#endif 
     75/* CX700 is undefined */ 
     76#ifndef PCI_DEVICE_ID_VIA_CX700 
     77#define PCI_DEVICE_ID_VIA_CX700 0x8324 
    7378#endif 
    7479 
    …… 
    419424 
    420425        switch (id->device) { 
     426        case PCI_DEVICE_ID_VIA_CX700: 
    421427        case PCI_DEVICE_ID_VIA_8251: 
    422428        case PCI_DEVICE_ID_VIA_8237: 
    …… 
    517523                .driver_data    = SMBBA3 
    518524        }, 
     525        { 
     526                .vendor         = PCI_VENDOR_ID_VIA, 
     527                .device         = PCI_DEVICE_ID_VIA_CX700, 
     528                .subvendor      = PCI_ANY_ID, 
     529                .subdevice      = PCI_ANY_ID, 
     530                .driver_data    = SMBBA3 
     531        }, 
    519532        { 0, } 
    520533}; 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/adm1024.c

    r3000 r4357  
    144144                           205-(val)*5) 
    145145 
    146 /* For each registered ADM1024, we need to keep some data in memory. That 
    147    data is pointed to by adm1024_list[NR]->data. The structure itself is 
     146/* For each registered ADM1024, we need to keep some data in memory. It is 
    148147   dynamically allocated, at the same time when a new adm1024 client is 
    149148   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/adm1025.c

    r3000 r4357  
    113113#define ALARMS_FROM_REG(val) (val) 
    114114 
    115 /* For each registered ADM1025, we need to keep some data in memory. That 
    116    data is pointed to by adm1025_list[NR]->data. The structure itself is 
     115/* For each registered ADM1025, we need to keep some data in memory. It is 
    117116   dynamically allocated, at the same time when a new adm1025 client is 
    118117   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/adm1026.c

    r3156 r4357  
    299299struct adm1026_data { 
    300300        struct i2c_client client; 
    301         struct semaphore lock; 
    302301        int sysctl_id; 
    303302        enum chips type; 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/bmcsensors.c

    r4277 r4357  
    3939 
    4040struct bmcsensors_data { 
    41         struct semaphore lock; 
    4241        int sysctl_id; 
    4342 
    …… 
    881880                        state = STATE_READING; 
    882881#ifdef DEBUG 
    883                         printk(KERN_DEBUG "bmcsensors.o: starting update\n", j); 
     882                        printk(KERN_DEBUG "bmcsensors.o: starting update\n"); 
    884883#endif 
    885884                        bmcsensors_get_reading(client, 0); 
    …… 
    889888                        bmc_do_pause(HZ / 25); 
    890889#ifdef DEBUG 
    891                 printk("bmcsensors.o: update complete; j = %d\n", j); 
     890                printk(KERN_DEBUG "bmcsensors.o: update complete; j = %d\n", j); 
    892891#endif 
    893892                data->last_updated = jiffies; 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/fscher.c

    r3147 r4357  
    104104/* Initial limits */ 
    105105 
    106 /* For each registered FSCHER, we need to keep some data in memory. That 
    107    data is pointed to by fscher_list[NR]->data. The structure itself is 
     106/* For each registered FSCHER, we need to keep some data in memory. It is 
    108107   dynamically allocated, at the same time when a new fscher client is 
    109108   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/fscpos.c

    r3156 r4357  
    108108/* Initial limits */ 
    109109 
    110 /* For each registered FSCPOS, we need to keep some data in memory. That 
    111    data is pointed to by fscpos_list[NR]->data. The structure itself is 
     110/* For each registered FSCPOS, we need to keep some data in memory. It is 
    112111   dynamically allocated, at the same time when a new fscpos client is 
    113112   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/fscscy.c

    r3147 r4357  
    152152/* Initial limits */ 
    153153 
    154 /* For each registered FSCSCY, we need to keep some data in memory. That 
    155    data is pointed to by fscscy_list[NR]->data. The structure itself is 
     154/* For each registered FSCSCY, we need to keep some data in memory. It is 
    156155   dynamically allocated, at the same time when a new fscscy client is 
    157156   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/it87.c

    r3200 r4357  
    216216#define DIV_FROM_REG(val) (1 << (val)) 
    217217 
    218 /* For each registered IT87, we need to keep some data in memory. That 
    219    data is pointed to by it87_list[NR]->data. The structure itself is 
     218/* For each registered IT87, we need to keep some data in memory. It is 
    220219   dynamically allocated, at the same time when a new it87 client is 
    221220   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/lm78.c

    r3156 r4357  
    112112   some corners. */ 
    113113 
    114 /* For each registered LM78, we need to keep some data in memory. That 
    115    data is pointed to by lm78_list[NR]->data. The structure itself is 
     114/* For each registered LM78, we need to keep some data in memory. It is 
    116115   dynamically allocated, at the same time when a new lm78 client is 
    117116   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/lm85.c

    r3156 r4357  
    374374struct lm85_data { 
    375375        struct i2c_client client; 
    376         struct semaphore lock; 
    377376        int sysctl_id; 
    378377        enum chips type; 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/lm90.c

    r3181 r4357  
    303303 
    304304/* The ADM1032 supports PEC but not on write byte transactions, so we need 
    305    to explicitely ask for a transaction without PEC. */ 
     305   to explicitly ask for a transaction without PEC. */ 
    306306static inline s32 adm1032_write_byte(struct i2c_client *client, u8 value) 
    307307{ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/maxilife.c

    r3147 r4357  
    234234 
    235235/* For each registered MaxiLife controller, we need to keep some data in 
    236    memory. That data is pointed to by maxi_list[NR]->data. The structure 
    237    itself is dynamically allocated, at the same time when a new MaxiLife 
     236   memory. It is dynamically allocated, at the same time when a new MaxiLife 
    238237   client is allocated. We assume MaxiLife will only be present on the 
    239238   SMBus and not on the ISA bus. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/mic74.c

    r3147 r4357  
    5555/* All registers are 0, except for MIC74_REG_DATA which is 0xFF */ 
    5656 
    57 /* For each registered MIC74, we need to keep some data in memory. That 
    58    data is pointed to by mic74_list[NR]->data. The structure itself is 
     57/* For each registered MIC74, we need to keep some data in memory. It is 
    5958   dynamically allocated, at the same time when a new mic74 client is 
    6059   allocated. */ 

  • lm-sensors/branches/lm-sensors-3.0.0/kernel/chips/sis5595.c

    r3044 r4357  
    162162#define DIV_TO_REG(val) ((val)==8?3:(val)==4?2:(val)==1?0:1) 
    163163 
    164 /* For the SIS5595, we need to keep some data in memory. That 
    165    data is pointed to by sis5595_list[NR]->data. The structure itself is 
     164/* For the SIS5595, we need to keep some data in memory. It is 
    166165   dynamically allocated, at the time when the new sis5595 client is 
    167166   allocated. */