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>

diff --git a/Documentation/i2c/busses/i2c-viapro b/Documentation/i2c/busses/i2c-viapro
index 2e758b0..b88f91a 100644 (file)
--- a/Documentation/i2c/busses/i2c-viapro
+++ b/Documentation/i2c/busses/i2c-viapro
@@ -20,7 +20,10 @@ Supported adapters:
     Datasheet: available on http://linux.via.com.tw
 
   * VIA Technologies, Inc. VX855/VX875
     Datasheet: available on http://linux.via.com.tw
 
   * VIA Technologies, Inc. VX855/VX875

-    Datasheet: Availability unknown
+    Datasheet: available on http://linux.via.com.tw
+
+  * VIA Technologies, Inc. VX900
+    Datasheet: available on http://linux.via.com.tw

 
 Authors:
        Kyösti Mälkki <kmalkki@cc.hut.fi>,
 
 Authors:
        Kyösti Mälkki <kmalkki@cc.hut.fi>,


@@ -57,6 +60,7 @@ Your lspci -n listing must show one of these :
  device 1106:8324   (CX700)
  device 1106:8353   (VX800/VX820)
  device 1106:8409   (VX855/VX875)
  device 1106:8324   (CX700)
  device 1106:8353   (VX800/VX820)
  device 1106:8409   (VX855/VX875)

+ device 1106:8410   (VX900)

 
 If none of these show up, you should look in the BIOS for settings like
 enable ACPI / SMBus or even USB.
 
 If none of these show up, you should look in the BIOS for settings like
 enable ACPI / SMBus or even USB.

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 8eed054..7f69f50 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -225,7 +225,7 @@ config I2C_VIA
          will be called i2c-via.
 
 config I2C_VIAPRO
          will be called i2c-via.
 
 config I2C_VIAPRO

-       tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx"
+       tristate "VIA VT82C596/82C686/82xx and CX700/VX8xx/VX900"

        depends on PCI
        help
          If you say yes to this option, support will be included for the VIA
        depends on PCI
        help
          If you say yes to this option, support will be included for the VIA


@@ -241,6 +241,7 @@ config I2C_VIAPRO
            CX700
            VX800/VX820
            VX855/VX875
            CX700
            VX800/VX820
            VX855/VX875

+           VX900

 
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.
 
          This driver can also be built as a module.  If so, the module
          will be called i2c-viapro.

diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 333011c..271c9a2 100644 (file)
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -401,6 +401,7 @@ found:
        case PCI_DEVICE_ID_VIA_CX700:
        case PCI_DEVICE_ID_VIA_VX800:
        case PCI_DEVICE_ID_VIA_VX855:
        case PCI_DEVICE_ID_VIA_CX700:
        case PCI_DEVICE_ID_VIA_VX800:
        case PCI_DEVICE_ID_VIA_VX855:

+       case PCI_DEVICE_ID_VIA_VX900:

        case PCI_DEVICE_ID_VIA_8251:
        case PCI_DEVICE_ID_VIA_8237:
        case PCI_DEVICE_ID_VIA_8237A:
        case PCI_DEVICE_ID_VIA_8251:
        case PCI_DEVICE_ID_VIA_8237:
        case PCI_DEVICE_ID_VIA_8237A:


@@ -470,6 +471,8 @@ static DEFINE_PCI_DEVICE_TABLE(vt596_ids) = {
          .driver_data = SMBBA3 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855),
          .driver_data = SMBBA3 },
          .driver_data = SMBBA3 },
        { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855),
          .driver_data = SMBBA3 },

+       { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX900),
+         .driver_data = SMBBA3 },

        { 0, }
 };
 
        { 0, }
 };
 

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 33880f6..9d36b82 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1427,6 +1427,7 @@
 #define PCI_DEVICE_ID_VIA_CX700_IDE    0x0581
 #define PCI_DEVICE_ID_VIA_VX800                0x8353
 #define PCI_DEVICE_ID_VIA_VX855                0x8409
 #define PCI_DEVICE_ID_VIA_CX700_IDE    0x0581
 #define PCI_DEVICE_ID_VIA_VX800                0x8353
 #define PCI_DEVICE_ID_VIA_VX855                0x8409

+#define PCI_DEVICE_ID_VIA_VX900                0x8410

 #define PCI_DEVICE_ID_VIA_8371_1       0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1     0x8598
 #define PCI_DEVICE_ID_VIA_838X_1       0xB188
 #define PCI_DEVICE_ID_VIA_8371_1       0x8391
 #define PCI_DEVICE_ID_VIA_82C598_1     0x8598
 #define PCI_DEVICE_ID_VIA_838X_1       0xB188