aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/i2c/busses/i2c-viapro6
-rw-r--r--drivers/i2c/busses/Kconfig3
-rw-r--r--drivers/i2c/busses/i2c-viapro.c3
-rw-r--r--include/linux/pci_ids.h1
4 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/i2c/busses/i2c-viapro b/Documentation/i2c/busses/i2c-viapro
index 2e758b0e9456..b88f91ae580e 100644
--- a/Documentation/i2c/busses/i2c-viapro
+++ b/Documentation/i2c/busses/i2c-viapro
@@ -20,7 +20,10 @@ Supported adapters:
20 Datasheet: available on http://linux.via.com.tw 20 Datasheet: available on http://linux.via.com.tw
21 21
22 * VIA Technologies, Inc. VX855/VX875 22 * VIA Technologies, Inc. VX855/VX875
23 Datasheet: Availability unknown 23 Datasheet: available on http://linux.via.com.tw
24
25 * VIA Technologies, Inc. VX900
26 Datasheet: available on http://linux.via.com.tw
24 27
25Authors: 28Authors:
26 Kyösti Mälkki <kmalkki@cc.hut.fi>, 29 Kyösti Mälkki <kmalkki@cc.hut.fi>,
@@ -57,6 +60,7 @@ Your lspci -n listing must show one of these :
57 device 1106:8324 (CX700) 60 device 1106:8324 (CX700)
58 device 1106:8353 (VX800/VX820) 61 device 1106:8353 (VX800/VX820)
59 device 1106:8409 (VX855/VX875) 62 device 1106:8409 (VX855/VX875)
63 device 1106:8410 (VX900)
60 64
61If none of these show up, you should look in the BIOS for settings like 65If none of these show up, you should look in the BIOS for settings like
62enable ACPI / SMBus or even USB. 66enable ACPI / SMBus or even USB.
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 8eed054e3293..7f69f500daf2 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -225,7 +225,7 @@ config I2C_VIA
225 will be called i2c-via. 225 will be called i2c-via.
226 226
227config I2C_VIAPRO 227config I2C_VIAPRO
228 tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx" 228 tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx/VX900"
229 depends on PCI 229 depends on PCI
230 help 230 help
231 If you say yes to this option, support will be included for the VIA 231 If you say yes to this option, support will be included for the VIA
@@ -241,6 +241,7 @@ config I2C_VIAPRO
241 CX700 241 CX700
242 VX800/VX820 242 VX800/VX820
243 VX855/VX875 243 VX855/VX875
244 VX900
244 245
245 This driver can also be built as a module. If so, the module 246 This driver can also be built as a module. If so, the module
246 will be called i2c-viapro. 247 will be called i2c-viapro.
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 333011c83d52..271c9a2b0fd7 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -401,6 +401,7 @@ found:
401 case PCI_DEVICE_ID_VIA_CX700: 401 case PCI_DEVICE_ID_VIA_CX700:
402 case PCI_DEVICE_ID_VIA_VX800: 402 case PCI_DEVICE_ID_VIA_VX800:
403 case PCI_DEVICE_ID_VIA_VX855: 403 case PCI_DEVICE_ID_VIA_VX855:
404 case PCI_DEVICE_ID_VIA_VX900:
404 case PCI_DEVICE_ID_VIA_8251: 405 case PCI_DEVICE_ID_VIA_8251:
405 case PCI_DEVICE_ID_VIA_8237: 406 case PCI_DEVICE_ID_VIA_8237:
406 case PCI_DEVICE_ID_VIA_8237A: 407 case PCI_DEVICE_ID_VIA_8237A:
@@ -470,6 +471,8 @@ static DEFINE_PCI_DEVICE_TABLE(vt596_ids) = {
470 .driver_data = SMBBA3 }, 471 .driver_data = SMBBA3 },
471 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855), 472 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855),
472 .driver_data = SMBBA3 }, 473 .driver_data = SMBBA3 },
474 { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX900),
475 .driver_data = SMBBA3 },
473 { 0, } 476 { 0, }
474}; 477};
475 478
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 33880f6f4e51..9d36b829533a 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1427,6 +1427,7 @@
1427#define PCI_DEVICE_ID_VIA_CX700_IDE 0x0581 1427#define PCI_DEVICE_ID_VIA_CX700_IDE 0x0581
1428#define PCI_DEVICE_ID_VIA_VX800 0x8353 1428#define PCI_DEVICE_ID_VIA_VX800 0x8353
1429#define PCI_DEVICE_ID_VIA_VX855 0x8409 1429#define PCI_DEVICE_ID_VIA_VX855 0x8409
1430#define PCI_DEVICE_ID_VIA_VX900 0x8410
1430#define PCI_DEVICE_ID_VIA_8371_1 0x8391 1431#define PCI_DEVICE_ID_VIA_8371_1 0x8391
1431#define PCI_DEVICE_ID_VIA_82C598_1 0x8598 1432#define PCI_DEVICE_ID_VIA_82C598_1 0x8598
1432#define PCI_DEVICE_ID_VIA_838X_1 0xB188 1433#define PCI_DEVICE_ID_VIA_838X_1 0xB188