diff --git a/CHANGES b/CHANGES index 2ba4d67f..8ba6c826 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,7 @@ SVN HEAD Man page i2cdetect.8: Scanning range can be restricted Module i2c-amd8111: Cleanups (2.6 backport) Fix initialization race (2.6 backport) + Module i2c-viapro: Add CX700 support (2.6 backport) Programs i2cdetect, i2cdump, isadump: Flush output in real time Program sensors-detect: Only probe relevant I2C addresses Drop ARP-capable device detection diff --git a/README b/README index 7d7c262f..ce81a9a2 100644 --- a/README +++ b/README @@ -60,7 +60,7 @@ At least the following I2C/SMBus adapters are supported: SMSC Victory66 3Dfx Voodoo 3 and Banshee VIA Technologies VT82C586B, VT82C596A/B, VT82C686A/B, VT8231, - VT8233, VT8233A, VT8235, VT8237R/A and VT8251 + VT8233, VT8233A, VT8235, VT8237R/A, VT8251, CX700 At least the following hardware sensor chips are supported: diff --git a/doc/busses/i2c-viapro b/doc/busses/i2c-viapro index f3491804..375d305d 100644 --- a/doc/busses/i2c-viapro +++ b/doc/busses/i2c-viapro @@ -10,7 +10,10 @@ Supported adapters: Datasheet: Sometimes available at the VIA website * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237R/A, VT8251 - Datasheet: available on request from Via + Datasheet: available on request and under NDA from VIA + + * VIA Technologies, Inc. CX700 + Datasheet: available on request and under NDA from VIA Authors: Kyösti Mälkki @@ -45,6 +48,7 @@ Your /proc/pci or lspci -n listing must show one of these : device 1106:3227 (VT8237R) device 1106:3337 (VT8237A) device 1106:3287 (VT8251) + device 1106:8324 (CX700) If none of these show up, you should look in the BIOS for settings like enable ACPI / SMBus or even USB. @@ -52,3 +56,6 @@ enable ACPI / SMBus or even USB. Except for the oldest chips (VT82C596A/B, VT82C686A and most probably VT8231), this driver supports I2C block transactions. Such transactions are mainly useful to read from and write to EEPROMs. + +The CX700 additionally appears to support SMBus PEC, although this driver +doesn't implement it. diff --git a/kernel/busses/i2c-viapro.c b/kernel/busses/i2c-viapro.c index ac0536b7..3a6d70f2 100644 --- a/kernel/busses/i2c-viapro.c +++ b/kernel/busses/i2c-viapro.c @@ -4,7 +4,7 @@ Copyright (c) 1998 - 2002 Frodo Looijaard , Philip Edelbrock , Kyösti Mälkki , Mark D. Studebaker - Copyright (C) 2005 Jean Delvare + Copyright (C) 2005 - 2007 Jean Delvare This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -36,6 +36,7 @@ VT8237R 0x3227 yes VT8237A 0x3337 yes VT8251 0x3287 yes + CX700 0x8324 yes Note: we assume there can only be one device, with one SMBus interface. */ @@ -63,14 +64,18 @@ #ifndef PCI_DEVICE_ID_VIA_8237 #define PCI_DEVICE_ID_VIA_8237 0x3227 #endif -/* 8237A is undefined as for the kernel 2.4.33 */ +/* 8237A is undefined */ #ifndef PCI_DEVICE_ID_VIA_8237A #define PCI_DEVICE_ID_VIA_8237A 0x3337 #endif -/* 8251 is undefined as for the kernel 2.4.33 */ +/* 8251 is undefined */ #ifndef PCI_DEVICE_ID_VIA_8251 #define PCI_DEVICE_ID_VIA_8251 0x3287 #endif +/* CX700 is undefined */ +#ifndef PCI_DEVICE_ID_VIA_CX700 +#define PCI_DEVICE_ID_VIA_CX700 0x8324 +#endif #define SMBBA1 0x90 #define SMBBA2 0x80 @@ -418,6 +423,7 @@ found: dev_dbg(pdev, "VT596_smba = 0x%X\n", vt596_smba); switch (id->device) { + case PCI_DEVICE_ID_VIA_CX700: case PCI_DEVICE_ID_VIA_8251: case PCI_DEVICE_ID_VIA_8237: case PCI_DEVICE_ID_VIA_8237A: @@ -516,6 +522,13 @@ static struct pci_device_id vt596_ids[] __initdata = { .subdevice = PCI_ANY_ID, .driver_data = SMBBA3 }, + { + .vendor = PCI_VENDOR_ID_VIA, + .device = PCI_DEVICE_ID_VIA_CX700, + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + .driver_data = SMBBA3 + }, { 0, } }; diff --git a/mkpatch/mkpatch.pl b/mkpatch/mkpatch.pl index adaf4cad..5fe3944c 100755 --- a/mkpatch/mkpatch.pl +++ b/mkpatch/mkpatch.pl @@ -264,7 +264,7 @@ CONFIG_I2C_VIA be built as a module which can be inserted and removed while the kernel is running. -VIA Technologies, Inc. VT82C596, 596B, 686A/B, 8233, 8235, 8237R/A, 8251 +VIA Technologies, Inc. VT82C596/82C686/82xx and CX700 CONFIG_I2C_VIAPRO If you say yes to this option, support will be included for the VIA Technologies I2C adapter on these chips. For integrated sensors on the @@ -985,7 +985,7 @@ sub gen_drivers_i2c_Config_in dep_tristate ' SiS 645/961,645DX/961,735' CONFIG_I2C_SIS645 $CONFIG_I2C $CONFIG_HOTPLUG dep_tristate ' Savage 4' CONFIG_I2C_SAVAGE4 $CONFIG_I2C_ALGOBIT dep_tristate ' VIA Technologies, Inc. VT82C586B' CONFIG_I2C_VIA $CONFIG_I2C_ALGOBIT - dep_tristate ' VIA Technologies, Inc. VT596A/B, 686A/B, 8231, 8233, 8233A, 8235, 8237R/A, 8251' CONFIG_I2C_VIAPRO $CONFIG_I2C + dep_tristate ' VIA Technologies, Inc. VT82C596/82C686/82xx and CX700' CONFIG_I2C_VIAPRO $CONFIG_I2C dep_tristate ' Voodoo3 I2C interface' CONFIG_I2C_VOODOO3 $CONFIG_I2C_ALGOBIT dep_tristate ' Pseudo ISA adapter (for some hardware sensors)' CONFIG_I2C_ISA $CONFIG_I2C fi