diff options
| author | Jean Delvare <khali@linux-fr.org> | 2012-10-05 16:23:53 -0400 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2012-10-05 16:23:53 -0400 |
| commit | 01d56a6aa1c3a506426c8f3ff87c8d698023f336 (patch) | |
| tree | bfba6da31bdaa637891ef96813c9a2f7dd6d72ca /drivers/i2c | |
| parent | 7fe442a1a50f8b4fe49f685f21b08dd8f070f429 (diff) | |
i2c-viapro: Add VIA VX900 device ID
The SMBus controller in the VIA VX900 appears to be compatible with
the VIA VX855, so just add the device ID.
This closes kernel bug #43096.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-viapro.c | 3 |
2 files changed, 5 insertions, 1 deletions
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 | ||
| 227 | config I2C_VIAPRO | 227 | config 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 | ||
